From 4efc642ca98135da5ead329fd60c80365cd0da17 Mon Sep 17 00:00:00 2001 From: Sean Young Date: Tue, 6 Dec 2022 13:01:10 +0000 Subject: [PATCH] Fix github actions warnings (#1092) Every CI run we get tons of warnings like: The `set-output` command is deprecated and will be disabled soon. Please upgrade to using Environment Files. It looks like actions-rs/toolchain is unmaintained: https://github.com/actions-rs/toolchain/issues/221 Many projects are switching over to dtolnay/rust-toolchain, let's do the same. Signed-off-by: Sean Young --- .github/workflows/build-llvm.yml | 2 +- .github/workflows/release.yml | 18 +++--------------- .github/workflows/test.yml | 27 +++++++-------------------- 3 files changed, 11 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build-llvm.yml b/.github/workflows/build-llvm.yml index 4354f0e6e..fa278cf50 100644 --- a/.github/workflows/build-llvm.yml +++ b/.github/workflows/build-llvm.yml @@ -105,7 +105,7 @@ jobs: mac-intel: name: Mac Intel needs: create - runs-on: macos-latest + runs-on: macos-11 steps: - run: git clone --depth 1 --branch solana-rustc/13.0-2021-08-08 https://github.com/solana-labs/llvm-project.git - name: Install Ninja diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d6e50df3..3f2a9e462 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -100,11 +100,7 @@ jobs: uses: actions/checkout@v2 with: submodules: recursive - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - default: true - toolchain: 1.63.0 + - uses: dtolnay/rust-toolchain@1.63.0 - run: git clone --depth 1 --branch solana-rustc/13.0-2021-08-08 https://github.com/solana-labs/llvm-project.git # We may not have enough space to compile llvm, see https://github.com/actions/virtual-environments/issues/326 working-directory: C:\ @@ -152,11 +148,7 @@ jobs: uses: actions/checkout@v3 with: submodules: recursive - - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.63.0 - default: true - profile: minimal + - uses: dtolnay/rust-toolchain@1.63.0 - run: git clone --depth 1 --branch solana-rustc/13.0-2021-08-08 https://github.com/solana-labs/llvm-project.git - name: Install Ninja uses: llvm/actions/install-ninja@main @@ -201,11 +193,7 @@ jobs: uses: actions/checkout@v3 with: submodules: recursive - - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.63.0 - default: true - profile: minimal + - uses: dtolnay/rust-toolchain@1.63.0 - run: git clone --depth 1 --branch solana-rustc/13.0-2021-08-08 https://github.com/solana-labs/llvm-project.git - name: Install Ninja uses: llvm/actions/install-ninja@main diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c160f5951..596b115af 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -108,11 +108,8 @@ jobs: run: unzip c:\llvm.zip -d c:/ - name: Add LLVM to Path run: echo "c:\llvm13.0\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@1.63.0 with: - profile: minimal - toolchain: 1.63.0 - default: true components: clippy # We run clippy on Linux in the lint job above, but this does not check #[cfg(windows)] items - name: Run cargo clippy @@ -135,11 +132,7 @@ jobs: uses: actions/checkout@v3 with: submodules: recursive - - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.63.0 - default: true - profile: minimal + - uses: dtolnay/rust-toolchain@1.63.0 - name: Get LLVM run: curl -L --output llvm13.0-mac-arm.tar.xz https://github.com/hyperledger/solang/releases/download/v0.2.0/llvm13.0-mac-arm.tar.xz - name: Extract LLVM @@ -157,17 +150,13 @@ jobs: mac-intel: name: Mac Intel - runs-on: macos-latest + runs-on: macos-11 steps: - name: Checkout sources uses: actions/checkout@v3 with: submodules: recursive - - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.63.0 - default: true - profile: minimal + - uses: dtolnay/rust-toolchain@1.63.0 - name: Get LLVM run: wget -q -O llvm13.0-mac-intel.tar.xz https://github.com/hyperledger/solang/releases/download/v0.2.0/llvm13.0-mac-intel.tar.xz - name: Extract LLVM @@ -185,7 +174,7 @@ jobs: mac-universal: name: Mac Universal Binary - runs-on: macos-latest + runs-on: macos-11 needs: [mac-arm, mac-intel] steps: - uses: actions/download-artifact@master @@ -353,10 +342,8 @@ jobs: - run: npm run compile working-directory: ./vscode - name: Run headless test - uses: GabrielBB/xvfb-action@v1 - with: - working-directory: ./vscode - run: npm test + run: xvfb-run npm test + working-directory: ./vscode - run: npm install -g vsce working-directory: ./vscode - run: vsce package