Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Nick Mathewson
Tor
Commits
198b6354
Commit
198b6354
authored
Sep 11, 2018
by
Nick Mathewson
👁
Browse files
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
parents
19429fac
7cea5a28
Changes
2
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
198b6354
...
@@ -36,7 +36,8 @@ matrix:
...
@@ -36,7 +36,8 @@ matrix:
-
env
:
COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
-
env
:
COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS=""
## We only want to check these build option combinations once
## We only want to check these build option combinations once
## (they shouldn't vary by compiler or OS)
## (they shouldn't vary by compiler or OS)
-
env
:
HARDENING_OPTIONS=""
## We run coverage with hardening off, which seems like enough
# - env: HARDENING_OPTIONS=""
## We check asciidoc with distcheck, to make sure we remove doc products
## We check asciidoc with distcheck, to make sure we remove doc products
-
env
:
DISTCHECK="yes" ASCIIDOC_OPTIONS=""
-
env
:
DISTCHECK="yes" ASCIIDOC_OPTIONS=""
...
@@ -55,9 +56,17 @@ matrix:
...
@@ -55,9 +56,17 @@ matrix:
## Clang doesn't work in containerized builds, see below.
## Clang doesn't work in containerized builds, see below.
-
compiler
:
clang
-
compiler
:
clang
sudo
:
false
sudo
:
false
##
We also exclude n
on-containerized gcc
, because they'
re slow and redundant.
##
N
on-containerized gcc
a
re slow and redundant.
-
compiler
:
gcc
-
compiler
:
gcc
sudo
:
required
sudo
:
required
## 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
## We don't need sudo. (The "apt:" stanza after this allows us to not need
## sudo; otherwise, we would need it for getting dependencies.)
## sudo; otherwise, we would need it for getting dependencies.)
...
...
changes/ticket27252
0 → 100644
View file @
198b6354
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.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment