From 659826826b78313c5c58e3da6ad4a8bd3c99832a Mon Sep 17 00:00:00 2001 From: SARDONYX-sard <68905624+SARDONYX-sard@users.noreply.github.com> Date: Sat, 17 Feb 2024 20:05:40 +0900 Subject: [PATCH] ci: remove musl & change cache behavior --- .github/workflows/release-cli.yaml | 1 + .github/workflows/release-gui.yaml | 13 +++---------- Cargo.toml | 1 - 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-cli.yaml b/.github/workflows/release-cli.yaml index 7f5eeb9..4a8c085 100644 --- a/.github/workflows/release-cli.yaml +++ b/.github/workflows/release-cli.yaml @@ -124,6 +124,7 @@ jobs: # ---- This part is not automatically generated. ---- - name: Install dependencies (ubuntu only) + # NOTE: This package specification will fail to find musl if musl is the target. if: runner.os == 'Linux' # You can remove libayatana-appindicator3-dev if you don't use the system tray feature. run: | diff --git a/.github/workflows/release-gui.yaml b/.github/workflows/release-gui.yaml index 8f0f292..0c51a7f 100644 --- a/.github/workflows/release-gui.yaml +++ b/.github/workflows/release-gui.yaml @@ -16,8 +16,7 @@ jobs: runs-on: ${{ matrix.platform }} steps: - - name: Checkout repository - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies (ubuntu only) if: matrix.platform == 'ubuntu-20.04' @@ -30,15 +29,9 @@ jobs: uses: dtolnay/rust-toolchain@stable - name: Rust cache - uses: actions/cache@v4 + uses: Swatinem/rust-cache@v2 with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-cargo- + prefix-key: cargo-${{ matrix.platform }} - name: Sync node version and setup cache uses: actions/setup-node@v4 diff --git a/Cargo.toml b/Cargo.toml index 137e2f4..d0c90da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,6 @@ targets = [ "aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", - "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc", ] # Publish jobs to run in CI