Try to fix CI (#2918)
Fixes a few issues that have been cropping up: * Update `rustup` on Windows to latest to skip over the 1.24.1 installed on GitHub Actions which can fail to install. * Remove the no-longer-needed `define-llvm-env` action * Install generic llvm/lldb packges instead of specific ones that may migrate in versions over time.
This commit is contained in:
9
.github/actions/install-rust/main.js
vendored
9
.github/actions/install-rust/main.js
vendored
@@ -6,11 +6,10 @@ function set_env(name, val) {
|
||||
fs.appendFileSync(process.env['GITHUB_ENV'], `${name}=${val}\n`)
|
||||
}
|
||||
|
||||
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`;
|
||||
fs.appendFileSync(process.env['GITHUB_PATH'], `${bindir}\n`);
|
||||
process.env.PATH = `${process.env.PATH}:${bindir}`;
|
||||
// Needed for now to get 1.24.2 which fixes a bug in 1.24.1 that causes issues
|
||||
// on Windows.
|
||||
if (process.platform === 'win32') {
|
||||
child_process.execFileSync('rustup', ['self', 'update']);
|
||||
}
|
||||
|
||||
child_process.execFileSync('rustup', ['set', 'profile', 'minimal']);
|
||||
|
||||
Reference in New Issue
Block a user