teor
b448f6044d
Merge branch 'maint-0.4.2'
2019-10-29 08:27:02 +10:00
teor
2395800d3e
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-29 08:26:55 +10:00
teor
63aff4a43e
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-29 08:26:48 +10:00
teor
54e2d0dc2d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-29 08:26:40 +10:00
teor
15d67842f9
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-29 08:26:32 +10:00
teor
752c35ca96
Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9
2019-10-29 08:23:35 +10:00
teor
f40eb2ead6
Merge remote-tracking branch 'tor-github/pr/1462'
2019-10-25 16:14:37 +10:00
teor
c3ff5ad56b
Travis: Install coccinelle on macOS and Linux
...
And print the spatch version and build details
Part of 31919.
2019-10-25 16:08:40 +10:00
teor
aff286618c
Merge branch 'maint-0.4.2'
2019-10-25 10:56:21 +10:00
teor
d7c40beeab
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-25 10:56:13 +10:00
teor
63581d55a6
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-25 10:56:06 +10:00
teor
e56e7e865e
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-25 10:55:58 +10:00
teor
1eb57b20b9
Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035
2019-10-25 09:48:14 +10:00
teor
8e549dd562
Travis: Use Ubuntu Bionic, but keep Trusty for chutney
...
Bionic has a recent coccinelle version, which passes our CI tests.
But Bionic (and Xenial) cause permissions errors for chutney.
We'll fix those in 32240.
Part of 31919.
2019-10-25 09:45:36 +10:00
teor
14b197a148
Travis: Use macOS 10.14 with Xcode 11.2
...
Closes ticket 32241.
2019-10-24 11:44:43 +10:00
teor
4a5c909ce5
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-23 08:47:15 +10:00
teor
641f130447
Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0
2019-10-23 08:35:17 +10:00
teor
c77162e4e9
Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5
2019-10-23 08:32:52 +10:00
teor
8682442c76
Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9
2019-10-23 08:32:22 +10:00
teor
b3478a8856
Merge branch 'maint-0.4.2'
2019-10-22 20:48:26 +10:00
teor
2318bb237f
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-22 20:48:13 +10:00
teor
9bb0ca122f
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-22 20:48:05 +10:00
teor
8f84999f58
Merge branch 'ticket32177_041' into ticket32177_042
...
Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build
from ticket32177_041.
2019-10-22 19:44:58 +10:00
teor
86b1714731
Merge branch 'ticket32177_040' into ticket32177_041
2019-10-22 19:43:38 +10:00
teor
868bcc24e5
Merge branch 'ticket32177_035' into ticket32177_040
2019-10-22 19:43:33 +10:00
teor
4c4a0d50ff
Travis: Disable the Rust macOS build
...
This build was added in 0.3.5.
We need to mitigate slow scheduling of Travis macOS jobs.
Closes ticket 32177.
2019-10-22 19:42:45 +10:00
teor
92ad87b808
Merge branch 'ticket32177_029' into ticket32177_035
...
Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029.
2019-10-22 19:42:23 +10:00
teor
511aeba8ee
Travis: Disable all but one macOS build
...
We need to mitigate slow scheduling of Travis macOS jobs.
Closes ticket 32177.
2019-10-22 19:35:43 +10:00
teor
bf45b6cf0c
Travis: Add a --disable-module-relay job
...
Part of 32123.
2019-10-20 20:26:02 +10:00
teor
e483257e1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-17 14:51:58 +10:00
teor
92c4dc9b14
Merge remote-tracking branch 'tor-github/pr/1373' into maint-0.4.2
2019-10-17 14:51:30 +10:00
teor
b0bf7e7b60
Travis: Allow the build to finish before the macOS Rust job
...
When we merged TOR_RUST_VERSION from master, the allow_failures rule
did not match any more. Update it to make it match.
Closes 31859 for master.
2019-10-02 10:09:02 +10:00
teor
58746ad9ca
Merge branch 'bug31859_041' into bug31859_master
...
Merge master's RUST_VERSION="nightly" into the macOS Rust job
from bug31859_041.
Drop master's RUST_VERSION="beta", because we only have two
Rust jobs now.
2019-10-02 00:20:38 +10:00
teor
e5dda7f664
Merge branch 'bug31859_040' into bug31859_041
...
Merge TOR_TEST_RNG_SEED in maint-0.4.1 into the coverage line
from bug31859_040.
2019-10-01 23:50:24 +10:00
teor
07db4141ab
Merge branch 'bug31859_035' into bug31859_040
2019-10-01 23:46:28 +10:00
teor
632e707397
Travis: Keep the macOS Rust job, but don't wait for it to finish
...
Since Rust on macOS is slow, don't wait for the macOS Rust job to finish.
Instead, split rust into slow rust (macOS) and fast rust (Linux). And
allow the build to finish before slow rust finishes.
Also make sure that we have:
* a Rust build on each platform,
* a Rust build with each compiler, and
* a check on all our Rust builds.
Finally, sort builds: allow fail last, macOS first, slowest first.
Closes 31859 for 0.3.5.
2019-10-01 23:42:51 +10:00
teor
4482d6fde5
Travis: Split jobs, add essential jobs, remove redundant jobs
...
Part of 31859 for 0.3.5.
2019-10-01 17:32:09 +10:00
teor
f368f5bc37
Merge branch 'bug31859_029' into bug31859_035
...
While merging:
* leave out some redundant jobs and build matrix entries
2019-10-01 17:31:55 +10:00
teor
1e0e23c1e4
Travis: Add a macOS chutney job, but don't wait for it to finish
...
Since Travis macOS has IPv6 support (and Travis Linux does not), chutney
will now run its IPv6 networks as part of Travis CI.
But since chutney is slow, don't wait for the macOS chutney to finish.
(Travis have fixed the duplicate notification bug in fast_finish. So we
can use fast_finish and allow_failure to finish early. Unfortunately,
allow_failure also means we ignore failures in macOS chutney.)
Also make sure that we have:
* a compile on each platform, with each compiler,
* a check on each platform, and
* a check on each compiler.
Finally, sort builds: allow fail last, macOS first, slowest first.
Closes ticket 30860.
Closes ticket 31859 for 0.2.9.
2019-09-30 23:58:38 +10:00
teor
4e4297830e
Travis: Remove a redundant clang Linux job
...
Part of 31859.
2019-09-30 23:58:24 +10:00
teor
8520071f23
Travis: Unroll the build matrix into matrix: include:
...
The jobs should be the same, but Travis may display them differently.
Part of 31859.
2019-09-26 18:06:09 +10:00
Nick Mathewson
7071144859
Merge branch 'ticket31372_041' into ticket31372_042
2019-09-24 08:04:41 -04:00
Nick Mathewson
836b7a538e
Merge branch 'ticket31372_040' into ticket31372_041
2019-09-24 08:04:20 -04:00
Nick Mathewson
246fdd8742
Merge branch 'ticket31372_035' into ticket31372_040
2019-09-24 08:02:44 -04:00
Nick Mathewson
da5c8277ea
Merge branch 'ticket31372_029' into ticket31372_035
2019-09-24 08:01:43 -04:00
Nick Mathewson
6ed3d8dbd1
Try using make -k in Travis configuration
...
Frequently, when a patch fails, it has failures in several files.
Using the "-k" flag will let us learn all the compilation errors,
not just the first one that the compiler hits.
Based on a patch by rl1987.
2019-09-23 15:05:08 -04:00
David Goulet
88a8deb420
Merge branch 'tor-github/pr/1236'
2019-08-29 12:58:25 -04:00
George Kadianakis
357e9a6f2c
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-27 11:49:36 +03:00
Nick Mathewson
f1707f7db3
Merge branch 'maint-0.4.1'
2019-08-24 16:29:23 -04:00
teor
7c92f4faa2
Merge branch 'bug31463_040' into bug31463_041
2019-08-22 22:10:06 +10:00
