test PRs

japaric · japaric · commit 945e2683f89a · 2018-08-26T23:47:07.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -56,6 +56,7 @@ before_cache:
 
 branches:
   only:
+    - master
     - staging
     - trying
 
diff --git a/ci/install.sh b/ci/install.sh
@@ -12,7 +12,4 @@ main() {
     curl -L https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2?revision=bc2c96c0-14b5-4bb4-9f18-bceb4050fee7?product=GNU%20Arm%20Embedded%20Toolchain,64-bit,,Linux,7-2018-q2-update | tar --strip-components=1 -C gcc -xj
 }
 
-# NOTE(TRAVIS_BRANCH) Travis is configured to only build *pushes* (not PRs)
-if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_EVENT_TYPE = cron ]; then
-    main
-fi
+main
diff --git a/ci/script.sh b/ci/script.sh
@@ -29,7 +29,4 @@ main() {
     fi
 }
 
-# NOTE See the NOTE in `install.sh`
-if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_EVENT_TYPE = cron ]; then
-    main
-fi
+main

-Original file line number
+Diff line change
 branches:
   only:
 +    - master
     - staging
     - trying
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,4 @@ main() {`
`12`	`12`	`curl -L https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2?revision=bc2c96c0-14b5-4bb4-9f18-bceb4050fee7?product=GNU%20Arm%20Embedded%20Toolchain,64-bit,,Linux,7-2018-q2-update \| tar --strip-components=1 -C gcc -xj`
`13`	`13`	`}`
`14`	`14`
`15`		`-# NOTE(TRAVIS_BRANCH) Travis is configured to only build pushes (not PRs)`
`16`		`-if [ $TRAVIS_BRANCH != master ] \|\| [ $TRAVIS_EVENT_TYPE = cron ]; then`
`17`		`- main`
`18`		`-fi`
	`15`	`+main`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,4 @@ main() {`
`29`	`29`	`fi`
`30`	`30`	`}`
`31`	`31`
`32`		-# NOTE See the NOTE in `install.sh`
`33`		`-if [ $TRAVIS_BRANCH != master ] \|\| [ $TRAVIS_EVENT_TYPE = cron ]; then`
`34`		`- main`
`35`		`-fi`
	`32`	`+main`