67 Commits

Author	SHA1	Message	Date
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
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	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
teor	b61d40c8a2	Travis: Only run one online rust build, to reduce network errors ... Part of 27252.	2018-08-23 18:17:03 +10:00
teor	99a2ecc795	Merge branch 'ticket27252-029' into ticket27252-032 ... This commit is already implemented in 0.3.2 and later: - Travis: Skip a duplicate hardening-off build in Tor 0.2.9	2018-08-23 18:15:55 +10:00
teor	7cea5a287f	Travis: Skip gcc on Linux with default settings ... It's redundant, because all the non-default builds use gcc on Linux. Part of 27252.	2018-08-23 18:13:53 +10:00
teor	9f81e03262	Travis: make the exclude descriptions shorter ... Part of 27252.	2018-08-23 18:12:36 +10:00
teor	7ec84cc094	Travis: Skip a duplicate hardening-off build in Tor 0.2.9 ... Part of 27252.	2018-08-23 17:08:28 +10:00
teor	8f89fb8f39	Travis: skip gcc on OSX, because the default compiler is clang ... Part of #27252.	2018-08-23 17:02:32 +10:00
teor	c28da0d8e1	Merge branch 'travis-osx-033' into travis-osx-034	2018-08-10 19:06:45 +10:00
teor	6463cdea55	Merge branch 'travis-osx-032' into travis-osx-033	2018-08-10 19:06:32 +10:00
teor	e2eec40c44	Merge branch 'travis-osx-029' into travis-osx-032 ... Merge asciidoc from 029 with rust from 032.	2018-08-10 19:06:01 +10:00
teor	d514e98663	Travis: add a missing macOS asciidoc env var	2018-08-10 18:26:33 +10:00
teor	a1c110a2a4	Merge branch 'travis-osx-033' into travis-osx-034 ... Take the asciidoc changes from 033, and the module changes from 034.	2018-08-10 16:41:27 +10:00
teor	ed1210d0f1	Merge branch 'travis-osx-032' into travis-osx-033 ... Preserve 033 changes since 032.	2018-08-10 16:38:13 +10:00
teor	f5aa667d48	Travis: Check Rust with distcheck in 0.3.3 and later ... Backports an 0.3.4 change that also works in 0.3.3. Part of 24629.	2018-08-10 16:37:06 +10:00
teor	a544af8186	Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later ... TOR_RUST_DEPENDENCIES used to be spelt RUST_DEPENDENCIES in 0.3.2. Re-applies 0.3.3 changes after 24629.	2018-08-10 16:34:04 +10:00
teor	69adc68ac6	Merge branch 'travis-osx-029' into travis-osx-032 ... Simple merge to resolve order conflicts.	2018-08-10 16:31:35 +10:00
teor	169afe3ca5	Travis: Improve Rust comments	2018-08-10 16:30:21 +10:00
teor	e78f9c5dfb	Travis: add a missing macOS asciidoc dependency	2018-08-10 16:24:31 +10:00
teor	2a33edc595	Travis: Check disable module dirauth with and without rust ... Part of 24629, also fixes 27088.	2018-08-10 13:23:58 +10:00
teor	7ec75e014f	Travis: Check Rust with distcheck in 0.3.3 and later ... Backports an 0.3.4 change that also works in 0.3.3. Part of 24629.	2018-08-10 12:44:20 +10:00
teor	82cccfbe25	Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later ... TOR_RUST_DEPENDENCIES used to be spelt RUST_DEPENDENCIES in 0.3.2. Re-applies 0.3.3 changes after 24629.	2018-08-10 12:42:18 +10:00
teor	f398da2e2d	Travis: put distcheck first for readability	2018-08-10 12:41:58 +10:00
teor	f4f2e43f5d	Travis: put distcheck first for readability	2018-08-10 12:33:51 +10:00
teor	3b1c74baa5	Travis: Use cargo cache ... Closes ticket 26952.	2018-08-10 11:23:26 +10:00
teor	f76cddd376	Travis: fix a typo	2018-08-10 10:50:35 +10:00
teor	aee51d9a0e	Travis: fix a typo	2018-08-09 23:44:27 +10:00
teor	e387eee362	Travis: add rust cargo offline mode ... Backports parts of the 0.3.3 travis config. Part of 24629.	2018-08-09 23:42:26 +10:00
teor	14ceee0fd1	Travis: add rust cargo online mode ... Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Also: * build rust on clang and gcc, Linux and macOS * build combinations of non-default options on gcc Linux * exclude broken builds * log the rustup version Part of 24629.	2018-08-09 23:40:24 +10:00
teor	e4d7f2667c	Travis: add lzma and zstd, where available ... Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Part of 24629, also fixes 27090.	2018-08-09 22:22:27 +10:00
teor	fa9a0cc1fe	Travis: list installed package versions before building ... Part of 24629.	2018-08-09 22:19:03 +10:00
teor	23b242104b	Travis: run an asciidoc build ... Implements 27087.	2018-08-09 22:19:00 +10:00
teor	286a6bc3b8	Travis: Use ccache ... Part of ticket 26952.	2018-08-09 22:18:53 +10:00
teor	74b3a340df	Travis: make macOS builds work for Tor 0.2.9 ... Tor 0.2.9 needs extra help to find OpenSSL on macOS. Part of 24629.	2018-08-09 22:18:44 +10:00
teor	7cf7b52fca	Travis: create configure flags once, then echo the flags ... Creating the configure flags once avoids inconsistent flags between configure and distcheck configure. Echoing the flags helps developers work out what configure is doing. (Backported to 0.2.9 and later as a precaution.) Fixes 27088 on 0.3.4.1-alpha, adds logging in previous releases.	2018-08-09 22:18:12 +10:00
teor	515d190b2c	Travis: enable macOS builds ... Also: * explain why we don't install zlib Part of 24629.	2018-08-09 22:17:50 +10:00
teor	c53f17fb1a	Travis: Rewrite .travis.yml ... Build on all compilers: * default options + hardening Build on gcc: * coverage (+ no hardening) * distcheck * no hardening Add some extra logging: * tail config.log on failure (config.log is too long for travis to render) Put the config in a more logical order * Sort config items in chronological order * Put related items together Part of 24629.	2018-08-09 18:33:41 +10:00