teor
7237637871
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-20 10:12:43 +10:00
teor
d96b35d663
Merge branch 'bug32240_32242_035' into bug32240_32242_040
...
Merge:
* libzstd-dev from ticket32242_035
* shellcheck from maint-0.4.0
2019-12-16 09:22:52 +10:00
teor
0b3763612c
Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035
2019-12-16 09:21:05 +10:00
teor
e2f78396f4
Merge branch 'bug32240_035' into bug32240_040
2019-12-16 09:14:32 +10:00
teor
75096de4c7
Merge branch 'bug32240_029' into bug32240_035
...
Merge
* Chutney Trusty deletion in bug32240_029
* NSS addition in maint-0.3.5
2019-12-16 09:09:16 +10:00
teor
0f07d25243
Travis: Run Chutney jobs in Ubuntu Bionic images
...
Closes 32240.
2019-12-16 09:03:48 +10:00
teor
704f3224a2
Travis: Turn off Tor's Sandbox in Chutney jobs
...
We need to set "Sandbox 0", until we fix sandbox errors that are
triggered by Ubuntu Xenial and Bionic. See 32722.
Part of 32240.
2019-12-16 09:01:45 +10:00
teor
ffccf6fc55
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-16 08:16:12 +10:00
teor
7481172983
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-16 08:16:04 +10:00
teor
05908d57f6
Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5
2019-12-16 08:14:04 +10:00
teor
7dd5946094
Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9
2019-12-16 08:13:38 +10:00
teor
14089a29b5
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-03 12:46:50 +10:00
teor
febbc236d4
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-03 12:46:43 +10:00
teor
62cf12a8bd
Travis: use -std=gnu99 with NSS, and clang with Chutney
...
NSS:
* test NSS-specific code with -std=gnu99
* use a recent gcc version from the latest Ubuntu image
Chutney:
* use clang, so we keep one clang Linux job
* keep clang on a fast job, so the overall build finishes quickly
Closes ticket 32500 for 0.3.5.
2019-12-03 12:46:22 +10:00
teor
145ff92d92
Merge branch 'maint-0.2.9' into maint-0.3.5
...
Merge C_DIALECT_OPTIONS from ticket32500_029 with
other configure options from maint-0.3.5.
2019-12-03 12:45:41 +10:00
teor
792c15fde2
Travis: use -std=gnu99 in some jobs
...
Require C99 standards-conforming code in Travis CI, but allow GNU gcc
extensions. Also activates clang's -Wtypedef-redefinition warnings.
Builds some jobs with -std=gnu99, and some jobs without.
Closes ticket 32500.
2019-12-03 12:42:39 +10:00
teor
6558bb4460
Travis: Disable the macOS Rust job
...
This time, we're disabling it because it's the lowest priority job.
(And also slow.)
Part of 32629.
2019-12-01 20:25:00 +10:00
teor
f2f7491cd9
Merge branch 'ticket32629_029' into ticket32629_035
...
Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.
2019-11-28 12:21:08 +10:00
teor
453e092e52
Revert "Travis: Disable the Rust macOS build"
...
This reverts commit 4c4a0d50ff
2019-11-28 12:11:37 +10:00
teor
99b5f1b261
Revert "Travis: Disable all but one macOS build"
...
This reverts commit 511aeba8ee
2019-11-28 12:10:10 +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
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
4342486649
Travis: Use zstd in our Travis Linux builds
...
Recent Ubuntu versions have zstd >= 1.1, which is an optional tor build
dependency.
Closes ticket 32242.
2019-10-24 09:26:54 +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
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
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
e483257e1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-17 14:51:58 +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
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
