aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jorge Aparicio <jorge@japaric.io> 2018-08-25 18:02:15 +0200
committerGravatar Jorge Aparicio <jorge@japaric.io> 2018-08-26 23:47:07 +0200
commit945e2683f89a031b44b65d25e1917f3157c49fa1 (patch)
tree0c3eed1a715253acf3378da4c731781fb72bd0e3
parentc33d890dcb5a03649f07dd6c46729e7873468b40 (diff)
downloadcortex-m-945e2683f89a031b44b65d25e1917f3157c49fa1.tar.gz
cortex-m-945e2683f89a031b44b65d25e1917f3157c49fa1.tar.zst
cortex-m-945e2683f89a031b44b65d25e1917f3157c49fa1.zip
test PRs
-rw-r--r--.travis.yml1
-rw-r--r--ci/install.sh5
-rw-r--r--ci/script.sh5
3 files changed, 3 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 846370a..ac4b63c 100644
--- 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
index 495e51d..371cc8e 100644
--- 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
index b088d95..d1d9279 100644
--- 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