T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to fix CI (#2918)

Browse Source 
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:
Alex Crichton
2021-05-21 10:54:37 -05:00
committed by GitHub
parent 8b9057a18f
commit 7d20368756
5 changed files with 6 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/actions/define-llvm-env/README.md vendored
View File

@@ -1,3 +0,0 @@
# define-llvm-env
Defines `DWARFDUMP` and `LLDB` path executable.

6
.github/actions/define-llvm-env/action.yml vendored
View File

@@ -1,6 +0,0 @@
name: 'Set up a DWARFDUMP env'
description: 'Set up a DWARFDUMP env (see tests/all/debug/dump.rs)'
runs:
using: node12
main: 'main.js'

19
.github/actions/define-llvm-env/main.js vendored
View File

@@ -1,19 +0,0 @@
#!/usr/bin/env node
const fs = require('fs');
function set_env(name, val) {
fs.appendFileSync(process.env['GITHUB_ENV'], `${name}=${val}\n`)
}
// On OSX pointing to brew's LLVM location.
if (process.platform == 'darwin') {
set_env("DWARFDUMP", "/usr/local/opt/llvm/bin/llvm-dwarfdump");
set_env("LLDB", "/usr/local/opt/llvm/bin/lldb");
}
// On Linux pointing to specific version
if (process.platform == 'linux') {
set_env("DWARFDUMP", "/usr/bin/llvm-dwarfdump-9");
set_env("LLDB", "/usr/bin/lldb-9");
}

9
.github/actions/install-rust/main.js vendored
View File

@@ -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']);