ci: Switch to rustup over 3rd party action

Also disable Linux arm builds for now, the Docker images they use are very old.
hrkfdn · Feb 4, 2024 · 216fe82 · 216fe82
1 parent f088149
commit 216fe82
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -15,7 +15,7 @@ jobs:
     container: ${{ matrix.container }}
     strategy:
       matrix:
-        build_target: [linux-x86_64, linux-arm64, linux-armhf, macos-x86_64, macos-aarch64, windows-x86_64]
+        build_target: [linux-x86_64, macos-x86_64, macos-aarch64, windows-x86_64]
         include:
           - build_target: linux-x86_64
             os: ubuntu-latest
@@ -53,11 +53,10 @@ jobs:
             target: x86_64-pc-windows-msvc
             features: '--no-default-features --features rodio_backend,pancurses_backend,share_clipboard,notify'
     steps:
+      - name: Install rustup
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain none -y
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          target: ${{ matrix.target }}
-          toolchain: stable
+        run: rustup target add ${{ matrix.target }}
       - name: Install macOS dependencies
         if: matrix.os == 'macos-latest'
         run: brew install portaudio pkg-config

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,9 +13,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        build_target: [linux, macos-x86_64, macos-aarch64, windows]
+        build_target: [linux-x86_64, macos-x86_64, macos-aarch64, windows]
         include:
-          - build_target: linux
+          - build_target: linux-x86_64
             os: ubuntu-latest
             artifact_suffix: linux-x86_64
             target: x86_64-unknown-linux-gnu
@@ -47,11 +47,12 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install rustup
+        run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain none -y
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          target: ${{ matrix.target }}
-          components: clippy, rustfmt
+        run: rustup target add ${{ matrix.target }}
+      - name: Install clippy + rustfmt
+        run: rustup component add clippy rustfmt
       - name: Install macOS dependencies
         if: matrix.os == 'macos-latest'
         run: brew install portaudio pkg-config