Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/actions/install-rust/main.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
const child_process = require('child_process');
const toolchain = process.env.INPUT_TOOLCHAIN;

for (var i = 0, keys = Object.keys(process.env), ii = keys.length; i < ii; i++) {
console.log(keys[i] + '=' + process.env[keys[i]]);
}

if (process.platform === 'darwin') {
child_process.execSync(`curl https://sh.rustup.rs | sh -s -- -y --default-toolchain=none --profile=minimal`);
const bindir = `${process.env.HOME}/.cargo/bin`;
console.log(`::add-path::${bindir}`);
process.env.PATH = `${process.env.PATH}:${bindir}`;
child_process.execFileSync('rustup', ['set', 'profile', 'minimal']);
}

child_process.execFileSync('rustup', ['set', 'profile', 'minimal']);
child_process.execFileSync('rustup', ['update', toolchain, '--no-self-update']);
child_process.execFileSync('rustup', ['default', toolchain]);
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,11 @@ jobs:
- build: beta
os: ubuntu-latest
rust: beta
# FIXME need to wait for rust-lang/rust#67065 to get into nightlies,
# and then this can be updated to `nightly` again.
- build: nightly
os: ubuntu-latest
rust: nightly
rust: nightly-2019-12-03
- build: macos
os: macos-latest
rust: stable
Expand Down