From ef1d87427d34a6779cf8d4a8bb20dfd875a88cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?= <me@alegon.dev>
Date: Sat, 26 Apr 2025 16:28:58 +0200
Subject: [PATCH] Simplify and optimize CI workflows

---
 .github/workflows/deploy.yml | 14 +++++++++++++-
 .github/workflows/oxipng.yml | 18 +++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1534f6e3..578e85d6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -39,6 +39,19 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4
 
+      - name: Install Rust toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: nightly
+          cache-bin: false
+          cache-shared-key: cache
+
+      - name: Install cargo-deb
+        if: endsWith(matrix.target, '-linux-gnu')
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-deb
+
       - name: Get the Oxipng version
         id: oxipngMeta
         run:
@@ -95,7 +108,6 @@ jobs:
         run: |
           mkdir -p "target/${{ matrix.target }}/release"
           mv target/oxipng "target/${{ matrix.target }}/release"
-          cargo install --locked cargo-deb
           cargo deb --target "${{ matrix.target }}" --no-build --no-strip
 
       - name: Create release notes
diff --git a/.github/workflows/oxipng.yml b/.github/workflows/oxipng.yml
index f63362bf..4929354f 100644
--- a/.github/workflows/oxipng.yml
+++ b/.github/workflows/oxipng.yml
@@ -91,15 +91,14 @@ jobs:
           # against glibc for the target architecture
           sudo apt-get -yq install qemu-user gcc-aarch64-linux-gnu libc6:arm64
 
-      - name: Cache Cargo artifacts
-        uses: Swatinem/rust-cache@v2
-
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: nightly
-          targets: ${{ env.CARGO_BUILD_TARGET }}
+          target: ${{ env.CARGO_BUILD_TARGET }}
           components: clippy, rustfmt
+          cache-bin: false
+          cache-shared-key: cache
 
       - name: Install nextest
         uses: taiki-e/install-action@nextest
@@ -181,11 +180,12 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Cache Cargo artifacts
-        uses: Swatinem/rust-cache@v2
-
       - name: Install MSRV Rust toolchain
-        uses: dtolnay/rust-toolchain@1.74.0
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.74.0
+          cache-bin: false
+          cache-shared-key: cache
 
       - name: Install nextest
         uses: taiki-e/install-action@nextest