Skip to content

Commit

Permalink
Fix github deprecated warnings
Browse files Browse the repository at this point in the history
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:

actions-rs/toolchain#221

Many projects are switching over to dtolnay/rust-toolchain, let's do
the same.

Signed-off-by: Sean Young <[email protected]>
  • Loading branch information
seanyoung committed Dec 5, 2022
1 parent 035b15b commit 84531f4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-llvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 3 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- 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:\
Expand Down Expand Up @@ -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/[email protected]
- 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
Expand Down Expand Up @@ -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/[email protected]
- 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
Expand Down
27 changes: 7 additions & 20 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/[email protected]
- 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
Expand All @@ -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/[email protected]
- 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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 84531f4

Please sign in to comment.