diff options
author | teor <teor@torproject.org> | 2018-08-23 18:18:50 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2018-08-23 18:19:42 +1000 |
commit | ae2085dd7be279b0fc3ff9c582d35a498c63350a (patch) | |
tree | f832757c985286e1fb09c2627faeb12e860651a5 /changes | |
parent | 8691046ac668282de421bd66c14748faac693749 (diff) | |
parent | 92f1a8af836933a3488e32bb03f859d5548883d7 (diff) | |
download | tor-ae2085dd7be279b0fc3ff9c582d35a498c63350a.tar.gz tor-ae2085dd7be279b0fc3ff9c582d35a498c63350a.zip |
Merge branch 'ticket27252-032' into ticket27252-033
Semantic merge:
- Rust offline and online were swapped in ticket27252-032
- TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2
Diffstat (limited to 'changes')
-rw-r--r-- | changes/ticket27252 | 6 | ||||
-rw-r--r-- | changes/ticket27252-032 | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/changes/ticket27252 b/changes/ticket27252 new file mode 100644 index 0000000000..410ddef8c0 --- /dev/null +++ b/changes/ticket27252 @@ -0,0 +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. diff --git a/changes/ticket27252-032 b/changes/ticket27252-032 new file mode 100644 index 0000000000..4752aedcf6 --- /dev/null +++ b/changes/ticket27252-032 @@ -0,0 +1,5 @@ + o Minor features (continuous integration): + - Only run one online rust build in Travis, to reduce network errors. + Skip offline rust builds on Travis for Linux gcc, because they're + redundant. + Implements ticket 27252. |