Merge pull request #1959 from s7tya/use-inline-script-instead-actions-rs

Use inline script instead actions-rs
rust-lang · Aug 6, 2024 · 8df1e5d · 8df1e5d
2 parents ee645a2 + 0d27c55
commit 8df1e5d
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 54 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,16 +16,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
       - name: Install toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.75.0
-          override: true
-          components: rustfmt, clippy
+        run: |
+          rustup install $RUST_TOOLCHAIN_VERSION
+          rustup default $RUST_TOOLCHAIN_VERSION
+          rustup component add --toolchain $RUST_TOOLCHAIN_VERSION rustfmt clippy
+        env:
+          RUST_TOOLCHAIN_VERSION: 1.75.0
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -73,15 +74,18 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
-      - name: Install latest beta
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: beta
-          override: true
+      - name: Install latest beta toolchain
+        run: |
+          rustup install %RUST_TOOLCHAIN_VERSION%
+          rustup default %RUST_TOOLCHAIN_VERSION%
+          rustup component add --toolchain %RUST_TOOLCHAIN_VERSION% rustfmt clippy
+        env:
+          RUST_TOOLCHAIN_VERSION: beta
+        shell: cmd
 
       - uses: Swatinem/rust-cache@v2
         with:
@@ -90,7 +94,7 @@ jobs:
       - name: cargo check
         run: cargo check
         env:
-            RUSTFLAGS: -Dwarnings
+          RUSTFLAGS: -Dwarnings
 
       - name: Run unit tests
         run: cargo test --all
@@ -121,15 +125,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
-      - name: Install latest beta
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: beta
-          override: true
+      - name: Install latest beta toolchain
+        run: |
+          rustup install $RUST_TOOLCHAIN_VERSION
+          rustup default $RUST_TOOLCHAIN_VERSION
+          rustup component add --toolchain $RUST_TOOLCHAIN_VERSION rustfmt clippy
+        env:
+          RUST_TOOLCHAIN_VERSION: beta
 
       - name: Configure environment
         run: |
@@ -158,15 +164,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
-      - name: Install latest beta
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: beta
-          override: true
+      - name: Install latest beta toolchain
+        run: |
+          rustup install $RUST_TOOLCHAIN_VERSION
+          rustup default $RUST_TOOLCHAIN_VERSION
+          rustup component add --toolchain $RUST_TOOLCHAIN_VERSION rustfmt clippy
+        env:
+          RUST_TOOLCHAIN_VERSION: beta
 
       - name: Configure environment
         run: |
@@ -192,15 +200,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
-      - name: Install latest beta
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: beta
-          override: true
+      - name: Install latest beta toolchain
+        run: |
+          rustup install $RUST_TOOLCHAIN_VERSION
+          rustup default $RUST_TOOLCHAIN_VERSION
+          rustup component add --toolchain $RUST_TOOLCHAIN_VERSION rustfmt clippy
+        env:
+          RUST_TOOLCHAIN_VERSION: beta
 
       - name: Configure environment
         run: |
@@ -223,15 +233,17 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
-      - name: Install latest beta
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: beta
-          override: true
+      - name: Install latest beta toolchain
+        run: |
+          rustup install $RUST_TOOLCHAIN_VERSION
+          rustup default $RUST_TOOLCHAIN_VERSION
+          rustup component add --toolchain $RUST_TOOLCHAIN_VERSION rustfmt clippy
+        env:
+          RUST_TOOLCHAIN_VERSION: beta
 
       # We build a specific version of Valgrind because the one from the Ubuntu 22.04 repositories
       # has problems with Rust debuginfo.
@@ -292,12 +304,15 @@ jobs:
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Install stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
+      - name: Install latest toolchain
+        run: |
+          rustup install $RUST_TOOLCHAIN_VERSION
+          rustup default $RUST_TOOLCHAIN_VERSION
+          rustup component add --toolchain $RUST_TOOLCHAIN_VERSION rustfmt clippy
+        env:
+          RUST_TOOLCHAIN_VERSION: stable
 
       - uses: Swatinem/rust-cache@v2
 
@@ -342,12 +357,15 @@ jobs:
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Install stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
+      - name: Install latest stable toolchain
+        run: |
+          rustup install $RUST_TOOLCHAIN_VERSION
+          rustup default $RUST_TOOLCHAIN_VERSION
+          rustup component add --toolchain $RUST_TOOLCHAIN_VERSION rustfmt clippy
+        env:
+          RUST_TOOLCHAIN_VERSION: stable
 
       - name: Install nightly
         run: rustup install nightly

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -14,18 +14,19 @@ jobs:
           echo "RUSTC_PERF_VERSION=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
 
       - name: Checkout the source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
       - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
+        run: |
+          rustup install $RUST_TOOLCHAIN_VERSION --profile minimal
+          rustup default $RUST_TOOLCHAIN_VERSION
+          rustup component add --toolchain $RUST_TOOLCHAIN_VERSION rustfmt clippy
+        env:
+          RUST_TOOLCHAIN_VERSION: stable
 
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
 
       - uses: actions/setup-node@v3
         with: