aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2018-08-23 18:13:53 +1000
committerteor <teor@torproject.org>2018-08-23 18:13:53 +1000
commit7cea5a287fbf0ed1b9ed92e144ff450c4f93f382 (patch)
treec8761a8c6b076a165171d0cbdcee67586d945463
parent9f81e03262ef3ba6491eaf14a93ec9c6e7bf5b45 (diff)
downloadtor-7cea5a287fbf0ed1b9ed92e144ff450c4f93f382.tar.gz
tor-7cea5a287fbf0ed1b9ed92e144ff450c4f93f382.zip
Travis: Skip gcc on Linux with default settings
It's redundant, because all the non-default builds use gcc on Linux. Part of 27252.
-rw-r--r--.travis.yml5
-rw-r--r--changes/ticket272522
2 files changed, 7 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 68534604ab..1e7e2fe2f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,11 @@ matrix:
## gcc on OSX is less useful, because the default compiler is clang.
- compiler: gcc
os: osx
+ ## gcc on Linux with no env is redundant, because all the custom builds use
+ ## gcc on Linux
+ - compiler: gcc
+ os: linux
+ env:
## 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
index 2ee4c8217f..410ddef8c0 100644
--- a/changes/ticket27252
+++ b/changes/ticket27252
@@ -1,4 +1,6 @@
o Minor features (continuous integration):
- Skip gcc on OSX in Travis CI, it's rarely used.
Skip a duplicate hardening-off build in Travis on Tor 0.2.9.
+ Skip gcc on Linux with default settings, because all the non-default
+ builds use gcc on Linux.
Implements ticket 27252.