nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
34,409 Commits 53 Branches 630 Tags 125 MiB
8d474e4dc5
Commit Graph

202 Commits

Author SHA1 Message Date
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
teor
8b32d22a07
Merge branch 'bug31463_035' into bug31463_040 2019-08-22 22:10:00 +10:00
Sebastian Hahn
190386f1c4
Fix gcc build exclude on travis 
The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't,
either. Reduces the number of builders by one.
 2019-08-22 22:09:32 +10:00
Sebastian Hahn
360a29e282 Rust: Update version requirements and CI 
The #[global_allocator] attribute is not available in versions prior to
1.28.0, the default-linker-libraries feature requires rust 1.31.0.

Adapt the CI to prevent accidental increases in Rust version by testing
against 1.31.0, beta and nightly.
 2019-08-20 07:16:46 +02:00
teor
0acfd7dcee
Merge branch 'maint-0.4.1' 2019-08-08 11:20:07 +10:00
teor
40d7f1e3a6
Merge branch 'maint-0.4.0' into maint-0.4.1 2019-08-08 11:19:58 +10:00
teor
0a661cde1d
Merge branch 'maint-0.3.5' into maint-0.4.0 2019-08-08 11:19:38 +10:00
teor
e83eabc9bf
Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5 
Merge changed chutney and stem script lines from 29280 with changed
stem script lines from 30591.
 2019-08-08 11:17:46 +10:00
teor
8d22c09abf
Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9 2019-08-08 10:55:24 +10:00
David Goulet
f7dc920f4b Merge branch 'maint-0.4.1' 2019-07-23 09:39:51 -04:00
teor
7541aaf988
Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041 2019-07-01 14:36:53 +10:00
teor
7b05f19801
Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040 
This merge removes an incorrect comment about the stem version
and commit script.
 2019-07-01 14:36:15 +10:00
teor
6bc8dedbed
Travis: SKIP_MAKE_CHECK="yes" when running stem 
And add some comments about stem

Part of 29280.
 2019-07-01 14:33:54 +10:00
teor
84f2c0affb
Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035 2019-07-01 14:33:37 +10:00
teor
75f9ae9029
Travis: remove a redundant os: linux line 
Linux is the first item in the os matrix, so we don't need to specify
it under matrix: include: .

Part of 29280.
 2019-07-01 14:25:37 +10:00
teor
ac7ce17983
Travis: show the chutney commit and python version 
Part of 29280.
 2019-07-01 14:25:33 +10:00
teor
b26e3e4c56
Travis: show chutney logs on chutney job failure 
Part of 29280.
 2019-07-01 14:05:26 +10:00
teor
5fda190309
Travis: Log stem's TRACE logs to a file, and tail it on failure 
Also filter out stem's SocketClosed logs, and fix some nearby comments.

Part of 30591.
 2019-07-01 13:01:52 +10:00
rl1987
84f0f15066 Improve comment in .travis.yml 2019-06-23 14:12:05 +03:00
rl1987
f9de9052e1 On Travis, put random data in ~/.torrc 2019-06-23 13:31:47 +03:00
teor
1cad1f9804
Travis: Don't log stem's SocketClosed TRACE logs to the console 
And fix some nearby comments.

Part of 30591.
 2019-06-14 12:13:28 +10:00
Nick Mathewson
63325c0596 Add a chutney mode to travis.yml. 2019-06-12 08:55:38 -04:00
Nick Mathewson
b0826346a6 Travis: control "make check" with its own flag 
Previously we had "make check" launched whenever DISTCHECK was
false.  Now we'd like to turn it off in a few other circumstances,
like running chutney.  Maybe stem too?
 2019-06-12 08:51:46 -04:00
teor
dcb8cad4e6
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 2019-06-11 14:51:46 +10:00
teor
a742a80eea
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 2019-06-11 14:51:37 +10:00
teor
202ccc3930
Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 2019-06-11 14:48:52 +10:00
Nick Mathewson
5b07ff4011 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-06-10 18:44:31 -04:00
Nick Mathewson
c8447f95ec Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0 2019-06-10 18:44:20 -04:00
Nick Mathewson
6a72cc2598 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-06-10 18:33:26 -04:00
teor
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040 2019-06-10 20:50:53 +10:00
teor
be0a4be276
Travis: Skip test_rebind on macOS builds 
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.

Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.

Fixes bug 30713; bugfix on 0.3.5.1-alpha.
 2019-06-10 20:49:59 +10:00
teor
d761c3ca6d
Travis: allow the test-stem job to fail 
Allow the test-stem job to fail in Travis, because it sometimes hangs.

Fixes bug 30744; bugfix on 0.3.5.4-alpha.
 2019-06-10 19:18:35 +10:00
Nick Mathewson
d63c17f2af Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0 2019-06-05 16:22:29 -04:00
Nick Mathewson
851e881f01 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0 2019-06-05 16:12:07 -04:00
teor
cdda69ca8a
Travis: only run the stem tests that use a tor binary 
Closes ticket 30694.
 2019-05-30 20:05:03 +10:00
teor
9eb221b2d2
Travis: make stem log a controller trace, and tail stem's tor log 
In Travis, make stem log a controller trace to the console.
And tail stem's tor log after failure.

Closes ticket 30591.
 2019-05-28 10:20:36 +10:00
Nick Mathewson
669f6e34ea Travis: fix an rng seed for coverage builds. 2019-05-15 07:50:56 -04:00
Nick Mathewson
0a2b96cae6 Merge remote-tracking branch 'tor-github/pr/989' 2019-05-02 08:36:09 -04:00
rl1987
10c71105e6 Travis: remove sudo configuration 
See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
 2019-04-30 09:16:33 +03:00
rl1987
5c00b25c0e Travis: remove sudo configuration 
See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
 2019-04-30 09:15:31 +03:00
rl1987
8f4840b31a Travis: remove sudo configuration 
See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
 2019-04-30 09:11:06 +03:00
Nick Mathewson
6559aefc7b Merge remote-tracking branch 'tor-github/pr/971' 2019-04-23 12:52:54 -04:00
teor
9a97b5ff56
Travis: Show stem's tor log after failure 
Closes ticket 30234.
 2019-04-22 11:48:07 +10:00
teor
c72f0cd5c7
Merge branch 'maint-0.3.5' into maint-0.4.0 2019-04-17 16:46:40 +10:00
George Kadianakis
9ae267538c Merge branch 'tor-github/pr/941' 2019-04-15 13:57:40 +03:00
teor
6d01879fe1 Travis: expand "make test-stem", so timelimit can signal python on timeout 
Unlike kill, timelimit can only signal the process it launches. So we need
timelimit to launch python, not make.

Closes ticket 30117; diagnostic for 29437.
 2019-04-12 08:38:30 -04:00
teor
6ef3819798
Travis: use stem backtrace signals with timelimit 
Part of 30117.
 2019-04-11 11:59:30 +10:00
teor
316aed502e
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5 2019-04-06 09:32:53 +10:00
George Kadianakis
2cc3c98bc4 Merge branch 'tor-github/pr/901' into maint-0.4.0 2019-04-05 14:56:52 +03:00
George Kadianakis
7fe169a500 Merge branch 'tor-github/pr/879' into maint-0.4.0 2019-04-05 14:55:09 +03:00
teor
ef06ef217a
Merge branch 'bug30011_035' into bug30011_040 
Merge bug30011 new package timelimit with 0.4.0 new package shellcheck.
Move shellcheck into the correct category.
 2019-04-04 13:23:26 +10:00
teor
3fa42d599a
Travis: Terminate test-stem if it takes more than 9.5 minutes to run 
(Travis terminates the job after 10 minutes of no output.)

Diagnostic for 29437.

Fixes bug 30011; bugfix on 0.3.5.4-alpha.
 2019-04-04 13:21:35 +10:00
teor
7014e57f4a
Merge branch 'bug29036-29962-034' into bug29036-29962-035 
Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.
 2019-04-01 14:11:20 +10:00
teor
33be8d8295
Travis: merge before_cache from 29036 and 29962 
And add some useful comments
 2019-04-01 14:08:34 +10:00
rl1987
0c6cfd9c65
Cleanup cargo registry before each Rust-enabled build 
Also, refrain from caching target/.

See: https://levans.fr/rust_travis_cache.html
 2019-04-01 14:08:12 +10:00
teor
ac28e56ccb
Merge branch 'bug29036-029' into bug29036-29962-034 2019-04-01 14:07:58 +10:00
teor
57e9fe2bba
Makefile: delete all the gcov-related files in reset-gcov 
And fix a comment.

See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
 2019-04-01 14:06:52 +10:00
Alexander Færøy
fbb1c7adfc Handle errors from coveralls more gracefully. 
Since we have moved coveralls to the script target the entire build will
now fail if coveralls fail. We handle it more gracefully by echo'ing the
failure instead of doing a hard-failure.

See: https://bugs.torproject.org/29036
 2019-03-20 15:44:06 +01:00
Alexander Færøy
0267c453e2 Run make reset-gcov after the script target in Travis CI is done. 
This should ensure that GCDA files are never entering the cache of
Travis CI.

See: https://bugs.torproject.org/29036
 2019-03-20 15:22:39 +01:00
rl1987
7857455729 Add shellcheck to Travis CI builds 2019-01-15 08:08:29 -05:00
rl1987
c31346ffb4 Print Python version during each Travis CI job 2018-12-06 15:26:34 +02:00
Nick Mathewson
262b0fe7a0 Merge remote-tracking branch 'tor-github/pr/381' into maint-0.3.5 2018-10-30 08:39:57 -04:00
rl1987
ccdb7a1cf9 Make sure we're not running distcheck and test-stem on the same CI job 2018-10-29 15:18:07 -04:00
rl1987
739b22c23a Log stem commit id 2018-10-29 15:18:07 -04:00
rl1987
4fd4e27163 Try putting stem repo cloning into install part of config 
Also print stem version when we have it downloaded
 2018-10-29 15:18:07 -04:00
rl1987
bee9093b55 Save time in CI test-stem job 
When running `make test-stem` on Travis, we should refrain from
also running `make check`. Furthermore, let's limit compilation
to src/app/tor target.
 2018-10-29 15:18:07 -04:00
rl1987
4184aa0ff7 Try running test-stem on travis 2018-10-29 15:18:07 -04:00
Nick Mathewson
98e28efa8c Merge branch 'nss-travis' into maint-0.3.5 2018-10-24 08:57:22 -04:00
Taylor Yu
36ba506508 report origin of mystery core file 
Report what program produced the mysterious core file that we
occasionally see on Travis CI during make distcheck.  Closes ticket
28024.
 2018-10-12 15:55:15 -05:00
Taylor Yu
484b259604 Merge branch 'bug27738-033' into bug27738-034 2018-10-10 15:13:02 -05:00
Taylor Yu
cc10873dee Merge remote-tracking branch 'teor/bug27738-032' into bug27738-033 2018-10-10 15:01:59 -05:00
Alex Crichton
3dca87e1f9 Reenable hardening options with Rust on Travis 
Previously the sanitizers are forcibly disabled as they were found to be
incompatible with Rust code. The nightly channel of Rust, however, now
has some fixes which should make this disabling no longer necessary.
 2018-10-01 22:48:46 -07:00
cypherpunks
fcbbcf92cb add --enable-nss build to Travis CI 2018-09-25 18:43:23 +00:00
teor
49ffc03572
Travis: use the Homebrew addon for xz and zstd 
xz and zstd were added as optional dependencies in 0.3.1.1-alpha.

Implements ticket 27738.
 2018-09-18 19:37:16 +10:00
teor
e81001a088
Merge branch 'bug27738-029' into bug27738-032 
Resolve conflicts due to modified comments, and deleted lines.
 2018-09-18 19:34:53 +10:00
teor
e8c7d7d3be
Travis: use the Homebrew addon 
Use the Travis Homebrew addon to install packages on macOS. The package
list is the same, but the Homebrew addon does not do a `brew update` by
default.

This makes builds faster, at the cost of using slightly older packages.

Implements ticket 27738.
 2018-09-18 19:26:54 +10:00
Nick Mathewson
46bccc50e5 Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4 2018-09-11 13:09:18 -04:00
Nick Mathewson
8e714d2a02 Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3 2018-09-11 13:09:09 -04:00
Nick Mathewson
c3a750486c Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2 2018-09-11 13:09:04 -04:00
Nick Mathewson
198b6354e6 Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9 2018-09-11 13:08:57 -04:00
Nick Mathewson
2b04163666 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-05 10:16:06 -04:00
Nick Mathewson
a7e72f0c44 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-05 10:15:45 -04:00
Nick Mathewson
57b207efa4 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-09-05 10:15:42 -04:00
Nick Mathewson
ff1486385a Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9 2018-09-05 10:14:56 -04:00
Nick Mathewson
67bdd144bd Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-05 09:56:19 -04:00
Nick Mathewson
2b1b8bf2ca Merge branch 'maint-0.2.9' into maint-0.3.2 2018-09-05 09:56:19 -04:00
Nick Mathewson
4ab033c3bc Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-05 09:56:19 -04:00
teor
35b0ac8d84
Travis: don't call echo with a --flag as the first argument 
When we use echo in Travis, don't pass a --flag as the first argument.

Fixes bug 27418; bugfix on 0.3.4.7-rc.
 2018-09-05 14:02:46 +10:00
teor
4e4b6a2476
Travis: when showing a log fails, keep trying to show other logs 
When a Travis build fails, and showing a log fails, keep trying to
show the other logs.

Fixes bug 27453; bugfix on 0.3.4.7-rc.
 2018-09-05 13:12:54 +10:00
teor
da17875ea5
Travis: Don't do a distcheck with --disable-module-dirauth 
Part of 27252.
 2018-08-23 18:20:39 +10:00
teor
e8dd83aecb
Merge branch 'ticket27252-033' into ticket27252-034 
Semantic merge:
- Rust offline and online were swapped in ticket27252-032
 2018-08-23 18:20:17 +10:00
teor
ae2085dd7b
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
 2018-08-23 18:19:42 +10:00
teor
92f1a8af83
Travis: Skip offline rust builds for Linux gcc 
We already do an online rust build for Linux gcc.

Part of 27252.
 2018-08-23 18:18:14 +10:00