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
3 changes: 0 additions & 3 deletions .github/actions/define-llvm-env/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions .github/actions/define-llvm-env/action.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/actions/define-llvm-env/main.js

This file was deleted.

9 changes: 4 additions & 5 deletions .github/actions/install-rust/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches: [main]
tags-ignore: [dev]
pull_request:
branches: [main]
branches: [main, stable-v0.26]
defaults:
run:
shell: bash
Expand Down Expand Up @@ -233,7 +233,6 @@ jobs:
- uses: ./.github/actions/install-rust
with:
toolchain: ${{ matrix.rust }}
- uses: ./.github/actions/define-llvm-env

- name: Install libclang
# Note: libclang is pre-installed on the macOS and linux images.
Expand Down Expand Up @@ -276,21 +275,18 @@ jobs:

# Test debug (DWARF) related functionality.
- run: |
sudo apt-get update && sudo apt-get install -y gdb lldb
sudo apt-get update && sudo apt-get install -y gdb lldb llvm
cargo test test_debug_dwarf -- --ignored --test-threads 1
if: matrix.os == 'ubuntu-latest'
env:
RUST_BACKTRACE: 1
LLDB: /usr/bin/lldb

# Test debug (DWARF) related functionality on new backend.
- run: |
sudo apt-get update && sudo apt-get install -y gdb lldb
cargo test test_debug_dwarf -- --ignored --test-threads 1 --test debug::
if: matrix.os == 'ubuntu-latest'
env:
RUST_BACKTRACE: 1
LLDB: /usr/bin/lldb

# Test uffd functionality on Linux
- run: |
Expand All @@ -310,7 +306,7 @@ jobs:
RUST_BACKTRACE: 1

# Perform all tests (debug mode) for `wasmtime` with the old x86 backend.
test_x64:
test_x86:
name: Test old x86 backend
runs-on: ubuntu-latest
steps:
Expand All @@ -320,7 +316,6 @@ jobs:
- uses: ./.github/actions/install-rust
with:
toolchain: stable
- uses: ./.github/actions/define-llvm-env

# Install wasm32 targets in order to build various tests throughout the
# repo.
Expand Down
1 change: 1 addition & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ vulnerability = "deny"
unmaintained = "deny"
yanked = "deny"
ignore = [
"RUSTSEC-2021-0064"
]

# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
Expand Down