Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Benjamin J. Thompson
Tor
Commits
2dee38fb
Commit
2dee38fb
authored
6 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Plain Diff
Merge branch 'maint-0.3.2' into maint-0.3.3
parents
78bf5641
df519e5d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+2
-2
2 additions, 2 deletions
.travis.yml
changes/ticket25714
+4
-0
4 additions, 0 deletions
changes/ticket25714
with
6 additions
and
2 deletions
.travis.yml
+
2
−
2
View file @
2dee38fb
...
...
@@ -128,8 +128,8 @@ install:
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || brew upgrade xz; }; fi
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt || brew upgrade libscrypt; }; fi
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd || brew upgrade zstd; }; fi
## Install the
nightly
channels of rustc and cargo and setup our toolchain environment
-
if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain
nightly
; fi
## Install the
stable
channels of rustc and cargo and setup our toolchain environment
-
if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain
stable
; fi
-
if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
## Get some info about rustc and cargo
-
if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi
...
...
This diff is collapsed.
Click to expand it.
changes/ticket25714
0 → 100644
+
4
−
0
View file @
2dee38fb
o Minor feature (continuous integration):
- Update the Travis CI configuration to use the stable Rust
channel, now that we have decided to require that. Closes
ticket 25714.
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment