diff options
| author | teor <teor@torproject.org> | 2018-08-10 11:43:17 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 11:43:17 +1000 |
| commit | 2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27 (patch) | |
| tree | af016c6f7efef8246ccabc1c3f8db03ed96050a5 /changes | |
| parent | c4d0d9bd24c484893055d50999377f86fd9468c7 (diff) | |
| parent | 4517c4c3e38fe93d668ab84dc5e7cb3bd0a3c173 (diff) | |
| download | tor-2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27.tar.gz tor-2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27.zip | |
Merge branch 'travis-osx-032' into travis-osx-033
Replace 033 .travis.yml with 032 .travis.yml.
Subsequent commits will restore 033 functionality.
src/rust/tor_util/include.am is deleted in 033.
Subsequent commits will apply 032 changes to
src/rust/tor_rust/include.am.
Replace 033 src/test/test_rust.sh with 032
src/test/test_rust.sh, which was backported from
master.
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug26497 | 3 | ||||
| -rw-r--r-- | changes/bug26497-backport | 3 | ||||
| -rw-r--r-- | changes/bug27088 | 5 | ||||
| -rw-r--r-- | changes/bug27090 | 3 | ||||
| -rw-r--r-- | changes/bug27093 | 3 | ||||
| -rw-r--r-- | changes/ticket26560 | 3 | ||||
| -rw-r--r-- | changes/ticket26952-cargo | 3 | ||||
| -rw-r--r-- | changes/ticket26952-ccache | 3 | ||||
| -rw-r--r-- | changes/ticket27087 | 3 |
9 files changed, 29 insertions, 0 deletions
diff --git a/changes/bug26497 b/changes/bug26497 new file mode 100644 index 0000000000..d0c05ff3e4 --- /dev/null +++ b/changes/bug26497 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Stop setting $CARGO_HOME. cargo will use the user's $CARGO_HOME, or + $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha. diff --git a/changes/bug26497-backport b/changes/bug26497-backport new file mode 100644 index 0000000000..1d86e01bf3 --- /dev/null +++ b/changes/bug26497-backport @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Backport test_rust.sh from master. + Fixes bug 26497; bugfix on 0.3.1.5-alpha. diff --git a/changes/bug27088 b/changes/bug27088 new file mode 100644 index 0000000000..d4d3b292c5 --- /dev/null +++ b/changes/bug27088 @@ -0,0 +1,5 @@ + o Minor bugfixes (continuous integration): + - Pass the module flags to distcheck configure, and + log the flags before running configure. (Backported + to 0.2.9 and later as a precaution.) + Fixes bug 27088; bugfix on 0.3.4.1-alpha. diff --git a/changes/bug27090 b/changes/bug27090 new file mode 100644 index 0000000000..3d119a9c30 --- /dev/null +++ b/changes/bug27090 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Build with zstd on macOS. + Fixes bug 27090; bugfix on 0.3.1.5-alpha. diff --git a/changes/bug27093 b/changes/bug27093 new file mode 100644 index 0000000000..6c097f1196 --- /dev/null +++ b/changes/bug27093 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Consistently use ../../.. as a fallback for $abs_top_srcdir in + test_rust.sh. Fixes bug 27093; bugfix on 0.3.4.3-alpha. diff --git a/changes/ticket26560 b/changes/ticket26560 new file mode 100644 index 0000000000..5b4fb1bfe7 --- /dev/null +++ b/changes/ticket26560 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Install libcap-dev and libseccomp2-dev so these optional + dependencies get tested on Travis CI. Closes ticket 26560. diff --git a/changes/ticket26952-cargo b/changes/ticket26952-cargo new file mode 100644 index 0000000000..e1efdfcd74 --- /dev/null +++ b/changes/ticket26952-cargo @@ -0,0 +1,3 @@ + o Minor features (continuous integration, rust): + - Use cargo cache in our Travis CI configuration. + Closes ticket 26952. diff --git a/changes/ticket26952-ccache b/changes/ticket26952-ccache new file mode 100644 index 0000000000..edc115e9de --- /dev/null +++ b/changes/ticket26952-ccache @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Use ccache in our Travis CI configuration. + Closes ticket 26952. diff --git a/changes/ticket27087 b/changes/ticket27087 new file mode 100644 index 0000000000..b8af70aaa0 --- /dev/null +++ b/changes/ticket27087 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Run asciidoc during Travis CI. + Implements ticket 27087. |