From b029c60e40145b5b9eee4740da8b3fe850c34681 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Mon, 18 Jul 2022 10:19:55 +0200 Subject: [PATCH] Changed CI rust install action to dtolnay one Defined toolchain and actions@v3 Use stable instead of v1 Use toolchain 1.59 instead of default stable Headless needs nightly Specify which nightly directly Try something different to specify the headless toolchain --- .github/workflows/benchmark.yaml | 7 +++---- .github/workflows/build.yml | 17 ++++++++--------- .github/workflows/coverage.yaml | 7 +++---- .github/workflows/documentation.yaml | 6 +++--- .github/workflows/lint.yaml | 7 +++---- .github/workflows/test-js.yaml | 7 +++---- .github/workflows/test-sys.yaml | 6 +++--- 7 files changed, 26 insertions(+), 31 deletions(-) diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml index d3d3fd9f124..3c27a2dd057 100644 --- a/.github/workflows/benchmark.yaml +++ b/.github/workflows/benchmark.yaml @@ -20,12 +20,11 @@ jobs: SCCACHE_AZURE_BLOB_CONTAINER: wasmerstoragesccacheblob SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.SCCACHE_AZURE_CONNECTION_STRING }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: - profile: minimal - override: true + toolchain: 1.59 - name: Configure cargo data directory # After this point, all cargo registry and crate data is stored in # $GITHUB_WORKSPACE/.cargo_home. This allows us to cache only the files diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00c131038d0..9e84fe23f6b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.SCCACHE_AZURE_CONNECTION_STRING }} TARGET: ${{ matrix.target }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up libstdc++ on Linux if: matrix.build == 'linux-x64' run: | @@ -93,10 +93,10 @@ jobs: run: | apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++ - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: + toolchain: 1.59 target: ${{ matrix.target }} - override: true - uses: Swatinem/rust-cache@v1 if: matrix.use_sccache != true - name: Install LLVM (macOS Apple Silicon) @@ -195,11 +195,9 @@ jobs: run: | make build-wapm - name: Install Nightly Rust for Headless - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@nightly with: - toolchain: 'nightly-2022-02-08' target: ${{ matrix.target }} - override: true components: "rust-src" - name: Build Minimal Wasmer Headless if: matrix.build != 'linux-musl-x64' @@ -216,7 +214,9 @@ jobs: echo "incremental = false" >> Cargo.toml echo "codegen-units = 1" >> Cargo.toml echo "rpath = false" >> Cargo.toml + rustup override set nightly make build-wasmer-headless-minimal + rustup override set stable - name: Dist if: matrix.build != 'macos-arm64' run: | @@ -241,11 +241,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable + toolchain: 1.59 target: aarch64-unknown-linux-gnu - override: true - name: Build cross image run: | docker build -t wasmer/aarch64 /home/runner/work/wasmer/wasmer/.github/cross-linux-aarch64/ diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 0e21fa7b737..ce0475081ce 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -17,12 +17,11 @@ jobs: name: Coverage runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: - profile: minimal - override: true + toolchain: 1.59 - name: Install LLVM (Linux) run: | curl --proto '=https' --tlsv1.2 -sSf https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz -L -o llvm.tar.xz diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml index 131ba949832..ddcfcc98fb6 100644 --- a/.github/workflows/documentation.yaml +++ b/.github/workflows/documentation.yaml @@ -12,11 +12,11 @@ jobs: name: Documentation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: - override: true + toolchain: 1.59 - name: Install LLVM shell: bash run: | diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index a0a66703b67..ad1de3fcb65 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -14,12 +14,11 @@ jobs: name: Code lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: - profile: minimal - override: true + toolchain: 1.59 components: rustfmt, clippy - name: Install LLVM (Linux) run: | diff --git a/.github/workflows/test-js.yaml b/.github/workflows/test-js.yaml index 57e60529724..e9556a41ba3 100644 --- a/.github/workflows/test-js.yaml +++ b/.github/workflows/test-js.yaml @@ -28,13 +28,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stabke with: - profile: minimal - override: true + toolchain: 1.59 - name: Install NodeJS uses: actions/setup-node@v2 diff --git a/.github/workflows/test-sys.yaml b/.github/workflows/test-sys.yaml index ccc5c59cd2a..b67ea15f89f 100644 --- a/.github/workflows/test-sys.yaml +++ b/.github/workflows/test-sys.yaml @@ -91,7 +91,7 @@ jobs: SCCACHE_AZURE_BLOB_CONTAINER: wasmerstoragesccacheblob SCCACHE_AZURE_CONNECTION_STRING: ${{ secrets.SCCACHE_AZURE_CONNECTION_STRING }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up libstdc++ on Linux if: matrix.build == 'linux-x64' run: | @@ -103,10 +103,10 @@ jobs: run: | apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++ - name: Install Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: + toolchain: 1.59 target: ${{ matrix.target }} - override: true - uses: Swatinem/rust-cache@v1 if: matrix.use_sccache != true - name: Install LLVM (Choco - Windows)