aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2018-08-23 17:00:42 +1000
committerteor <teor@torproject.org>2018-08-23 17:02:32 +1000
commit8f89fb8f398c365588d456625c77cdaee97c77bd (patch)
treef76c5e2f590276e9e763a1844ef6b04320701c53
parent9068e2fa280395ba15d30465ec25141cff876922 (diff)
downloadtor-8f89fb8f398c365588d456625c77cdaee97c77bd.tar.gz
tor-8f89fb8f398c365588d456625c77cdaee97c77bd.zip
Travis: skip gcc on OSX, because the default compiler is clang
Part of #27252.
-rw-r--r--.travis.yml3
-rw-r--r--changes/ticket272523
2 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 8b8621007e..102b500308 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,9 @@ matrix:
## We also exclude non-containerized gcc, because they're slow and redundant.
- compiler: gcc
sudo: required
+ ## And skip gcc on OSX, because the default compiler is clang
+ - compiler: gcc
+ os: osx
## We don't need sudo. (The "apt:" stanza after this allows us to not need
## sudo; otherwise, we would need it for getting dependencies.)
diff --git a/changes/ticket27252 b/changes/ticket27252
new file mode 100644
index 0000000000..f0855db1d4
--- /dev/null
+++ b/changes/ticket27252
@@ -0,0 +1,3 @@
+ o Minor features (continuous integration):
+ - Skip gcc on OSX in Travis CI, it's rarely used.
+ Implements ticket 27252.