From 95103a4748259580067a1c134033fa0d34ff2919 Mon Sep 17 00:00:00 2001
From: Sean Young <sean@mess.org>
Date: Mon, 5 Dec 2022 14:42:42 +0000
Subject: [PATCH] Fix github deprecated warnings

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 <sean@mess.org>
---
 .github/workflows/release.yml |  6 +++---
 .github/workflows/test.yml    | 23 +++++++++--------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9d6e50df3d..2571dc80f6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -100,7 +100,7 @@ jobs:
       uses: actions/checkout@v2
       with:
         submodules: recursive
-    - uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@v1
       with:
         profile: minimal
         default: true
@@ -152,7 +152,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@v1
       with:
           toolchain: 1.63.0
           default: true
@@ -201,7 +201,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@v1
       with:
           toolchain: 1.63.0
           default: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c160f59517..f23283fab9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -108,11 +108,10 @@ 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@v1
       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 +134,10 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@v1
       with:
-          toolchain: 1.63.0
-          default: true
-          profile: minimal
+        toolchain: 1.63.0
+        profile: minimal
     - 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
@@ -163,11 +161,10 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@v1
       with:
-          toolchain: 1.63.0
-          default: true
-          profile: minimal
+        toolchain: 1.63.0
+        profile: minimal
     - 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
@@ -353,10 +350,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