davesque · April 26, 2018 22:02 · Apr 26, 2018 · Apr 26, 2018 · Apr 26, 2018 · Apr 26, 2018
diff --git a/circleci.md b/circleci.md
@@ -49,7 +49,7 @@
     git rm .travis.yml
     ...
     ```
-  - Click on project link to open project:
+  - On travis-ci.org, click on project link to open project:
     <div><img src="https://gist.githubusercontent.com/davesque/75a872032585e79b9281ed6769381314/raw/fec6698da30d5e57a8a4c35a6e00a85c02878fe6/Screen%2520Shot%25202018-04-26%2520at%25203.27.34%2520PM.png" width="50%"></div>
   - Select "Settings" from options menu:
     <div><img src="https://gist.github.com/davesque/75a872032585e79b9281ed6769381314/raw/322f12ec3cffffc86c50b9b185e0205572c82283/Screen%2520Shot%25202018-04-26%2520at%25203.27.45%2520PM.png" width="100%"></div>

diff --git a/circleci.md b/circleci.md
@@ -44,6 +44,11 @@
 [![Build Status](https://circleci.com/gh/ethereum/<repo name>.svg?style=shield)](https://circleci.com/gh/ethereum/<repo name>)
 ```
 * Disable Travis CI:
+  - Remove `.travis.yml` from project repo:
+    ```
+    git rm .travis.yml
+    ...
+    ```
   - Click on project link to open project:
     <div><img src="https://gist.githubusercontent.com/davesque/75a872032585e79b9281ed6769381314/raw/fec6698da30d5e57a8a4c35a6e00a85c02878fe6/Screen%2520Shot%25202018-04-26%2520at%25203.27.34%2520PM.png" width="50%"></div>
   - Select "Settings" from options menu:

diff --git a/circleci.md b/circleci.md
@@ -51,3 +51,4 @@
     <div><img src="https://gist.github.com/davesque/75a872032585e79b9281ed6769381314/raw/322f12ec3cffffc86c50b9b185e0205572c82283/Screen%2520Shot%25202018-04-26%2520at%25203.28.00%2520PM.png" width="50%"></div>
   - Activate "Build only if .travis.yml is present" option (might also need to deactivate "Build pushed pull requests" option):
     <div><img src="https://gist.github.com/davesque/75a872032585e79b9281ed6769381314/raw/322f12ec3cffffc86c50b9b185e0205572c82283/Screen%2520Shot%25202018-04-26%2520at%25203.28.28%2520PM.png" width="100%"></div>
+    <div><img src="https://gist.github.com/davesque/75a872032585e79b9281ed6769381314/raw/7877df9a7e69b2268357841f642cdfcd613754f0/Screen%2520Shot%25202018-04-26%2520at%25203.56.26%2520PM.png" width="100%"></div>
diff --git a/Screen Shot 2018-04-26 at 3.56.26 PM.png b/Screen Shot 2018-04-26 at 3.56.26 PM.png
diff --git a/circleci.md b/circleci.md
@@ -49,5 +49,5 @@
   - Select "Settings" from options menu:
     <div><img src="https://gist.github.com/davesque/75a872032585e79b9281ed6769381314/raw/322f12ec3cffffc86c50b9b185e0205572c82283/Screen%2520Shot%25202018-04-26%2520at%25203.27.45%2520PM.png" width="100%"></div>
     <div><img src="https://gist.github.com/davesque/75a872032585e79b9281ed6769381314/raw/322f12ec3cffffc86c50b9b185e0205572c82283/Screen%2520Shot%25202018-04-26%2520at%25203.28.00%2520PM.png" width="50%"></div>
-  - Activate "Build only if .travis.yml is present" option (might also need the "Build pushed pull requests" option):
+  - Activate "Build only if .travis.yml is present" option (might also need to deactivate "Build pushed pull requests" option):
     <div><img src="https://gist.github.com/davesque/75a872032585e79b9281ed6769381314/raw/322f12ec3cffffc86c50b9b185e0205572c82283/Screen%2520Shot%25202018-04-26%2520at%25203.28.28%2520PM.png" width="100%"></div>
diff --git a/circleci.md b/circleci.md
@@ -46,3 +46,8 @@
 * Disable Travis CI:
   - Click on project link to open project:
     <div><img src="https://gist.githubusercontent.com/davesque/75a872032585e79b9281ed6769381314/raw/fec6698da30d5e57a8a4c35a6e00a85c02878fe6/Screen%2520Shot%25202018-04-26%2520at%25203.27.34%2520PM.png" width="50%"></div>
+  - Select "Settings" from options menu:
+    <div><img src="https://gist.github.com/davesque/75a872032585e79b9281ed6769381314/raw/322f12ec3cffffc86c50b9b185e0205572c82283/Screen%2520Shot%25202018-04-26%2520at%25203.27.45%2520PM.png" width="100%"></div>
+    <div><img src="https://gist.github.com/davesque/75a872032585e79b9281ed6769381314/raw/322f12ec3cffffc86c50b9b185e0205572c82283/Screen%2520Shot%25202018-04-26%2520at%25203.28.00%2520PM.png" width="50%"></div>
+  - Activate "Build only if .travis.yml is present" option (might also need the "Build pushed pull requests" option):
+    <div><img src="https://gist.github.com/davesque/75a872032585e79b9281ed6769381314/raw/322f12ec3cffffc86c50b9b185e0205572c82283/Screen%2520Shot%25202018-04-26%2520at%25203.28.28%2520PM.png" width="100%"></div>
diff --git a/circleci.md b/circleci.md
@@ -45,4 +45,4 @@
 ```
 * Disable Travis CI:
   - Click on project link to open project:
-    <img src="https://gist.githubusercontent.com/davesque/75a872032585e79b9281ed6769381314/raw/fec6698da30d5e57a8a4c35a6e00a85c02878fe6/Screen%2520Shot%25202018-04-26%2520at%25203.27.34%2520PM.png" width="50%">
+    <div><img src="https://gist.githubusercontent.com/davesque/75a872032585e79b9281ed6769381314/raw/fec6698da30d5e57a8a4c35a6e00a85c02878fe6/Screen%2520Shot%25202018-04-26%2520at%25203.27.34%2520PM.png" width="50%"></div>
diff --git a/circleci.md b/circleci.md
@@ -45,4 +45,4 @@
 ```
 * Disable Travis CI:
   - Click on project link to open project:
-    ![open project](https://gist.githubusercontent.com/davesque/75a872032585e79b9281ed6769381314/raw/fec6698da30d5e57a8a4c35a6e00a85c02878fe6/Screen%2520Shot%25202018-04-26%2520at%25203.27.34%2520PM.png =200x)
+    <img src="https://gist.githubusercontent.com/davesque/75a872032585e79b9281ed6769381314/raw/fec6698da30d5e57a8a4c35a6e00a85c02878fe6/Screen%2520Shot%25202018-04-26%2520at%25203.27.34%2520PM.png" width="50%">
diff --git a/circleci.md b/circleci.md
@@ -44,5 +44,5 @@
 [![Build Status](https://circleci.com/gh/ethereum/<repo name>.svg?style=shield)](https://circleci.com/gh/ethereum/<repo name>)
 ```
 * Disable Travis CI:
-  - Open project on travis:
-    ![open project](https://gist.githubusercontent.com/davesque/75a872032585e79b9281ed6769381314/raw/fec6698da30d5e57a8a4c35a6e00a85c02878fe6/Screen%2520Shot%25202018-04-26%2520at%25203.27.34%2520PM.png)
+  - Click on project link to open project:
+    ![open project](https://gist.githubusercontent.com/davesque/75a872032585e79b9281ed6769381314/raw/fec6698da30d5e57a8a4c35a6e00a85c02878fe6/Screen%2520Shot%25202018-04-26%2520at%25203.27.34%2520PM.png =200x)
diff --git a/circleci.md b/circleci.md
@@ -45,4 +45,4 @@
 ```
 * Disable Travis CI:
   - Open project on travis:
-    ![open project](https://gist.github.com/davesque/75a872032585e79b9281ed6769381314#file-screen-shot-2018-04-26-at-3-27-34-pm-png)
+    ![open project](https://gist.githubusercontent.com/davesque/75a872032585e79b9281ed6769381314/raw/fec6698da30d5e57a8a4c35a6e00a85c02878fe6/Screen%2520Shot%25202018-04-26%2520at%25203.27.34%2520PM.png)
diff --git a/circleci.md b/circleci.md
@@ -42,4 +42,7 @@
 * Update badge in README:
 ```
 [![Build Status](https://circleci.com/gh/ethereum/<repo name>.svg?style=shield)](https://circleci.com/gh/ethereum/<repo name>)
-```
+```
+* Disable Travis CI:
+  - Open project on travis:
+    ![open project](https://gist.github.com/davesque/75a872032585e79b9281ed6769381314#file-screen-shot-2018-04-26-at-3-27-34-pm-png)
diff --git a/Screen Shot 2018-04-26 at 3.27.34 PM.png b/Screen Shot 2018-04-26 at 3.27.34 PM.png
diff --git a/Screen Shot 2018-04-26 at 3.27.45 PM.png b/Screen Shot 2018-04-26 at 3.27.45 PM.png
diff --git a/Screen Shot 2018-04-26 at 3.28.00 PM.png b/Screen Shot 2018-04-26 at 3.28.00 PM.png
diff --git a/Screen Shot 2018-04-26 at 3.28.28 PM.png b/Screen Shot 2018-04-26 at 3.28.28 PM.png
diff --git a/circleci.md b/circleci.md
@@ -0,0 +1,45 @@
+# Migration to Circle CI
+
+* Update `.circleci/config.yaml`:
+```
+ common: &common
+   working_directory: ~/repo
+   steps:
+     - checkout
++    - run:
++        name: merge pull request base
++        command: |
++          if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
++            PR_INFO_URL=https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pulls/$CIRCLE_PR_NUMBER
++
++            PR_BASE_BRANCH=$(curl -L "$PR_INFO_URL" | python -c 'import json, sys; obj = json.load(sys.stdin); sys.stdout.write(obj["base"]["ref"])')
++            git fetch origin +"$PR_BASE_BRANCH":circleci/pr-base
++
++            # We need these config values or git complains when creating the
++            # merge commit
++            git config --global user.name "Circle CI"
++            git config --global user.email "circleci@example.com"
++
++            git merge --no-edit circleci/pr-base
++          fi
+     - restore_cache:
+         keys:
+           - cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
+     - run:
+         name: install dependencies
+         command: pip install --user tox
+     - run:
+         name: run tox
+         command: ~/.local/bin/tox
+     - save_cache:
+         paths:
+           - .tox
+           - ~/.cache/pip
+           - ~/.local
+           - ./eggs
+         key: cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
+```
+* Update badge in README:
+```
+[![Build Status](https://circleci.com/gh/ethereum/<repo name>.svg?style=shield)](https://circleci.com/gh/ethereum/<repo name>)
+```
No results found