From 5cceec27a585bc814cd9ec2626cf6427f374e789 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Tue, 10 Jun 2025 15:04:46 +0200 Subject: [PATCH 1/3] Replace actions-rs actions --- .github/workflows/publish.yml | 8 +++----- .github/workflows/rust.yml | 14 ++++---------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1630e9a..7d8a2fd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -29,11 +29,9 @@ jobs: uses: actions/checkout@v4 - name: Set up Rust - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - override: true - components: rustfmt, clippy + run: | + rustup toolchain add --profile=minimal nightly + rustup override set nightly - name: Update version in Cargo.toml run: | VERSION=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//') diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7ddc354..f368c36 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -29,17 +29,11 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.target == 'i686-pc-windows-gnu' && format('{0}-i686-pc-windows-gnu', matrix.channel) || matrix.channel }} - target: ${{ matrix.target }} - override: true - components: rustfmt + - run: | + rustup toolchain add ${{ matrix.target == 'i686-pc-windows-gnu' && format('{0}-i686-pc-windows-gnu', matrix.channel) || matrix.channel }} - - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + - run: | + cargo fmt --all -- --check - uses: actions/setup-java@v4 with: From 0bd608844c13d1baa319d8e78941b43a054dd95d Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Tue, 10 Jun 2025 15:10:25 +0200 Subject: [PATCH 2/3] fix missing components --- .github/workflows/publish.yml | 2 +- .github/workflows/rust.yml | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7d8a2fd..752381a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Rust run: | - rustup toolchain add --profile=minimal nightly + rustup toolchain add --profile=minimal --component rustfmt,clippy nightly rustup override set nightly - name: Update version in Cargo.toml run: | diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index f368c36..c0bbb42 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -29,8 +29,11 @@ jobs: steps: - uses: actions/checkout@v4 - - run: | - rustup toolchain add ${{ matrix.target == 'i686-pc-windows-gnu' && format('{0}-i686-pc-windows-gnu', matrix.channel) || matrix.channel }} + - name: Setup toolchain + env: + TOOLCHAIN: ${{ matrix.target == 'i686-pc-windows-gnu' && format('{0}-i686-pc-windows-gnu', matrix.channel) || matrix.channel }} + run: | + rustup toolchain add --component rustfmt --target ${{ matrix.target }} $TOOLCHAIN - run: | cargo fmt --all -- --check From 1529029ae0f2f351ecdc554e839f9ca85e0ed4cb Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Tue, 10 Jun 2025 15:31:56 +0200 Subject: [PATCH 3/3] fix intel macos runner --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c0bbb42..3c2aef0 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -154,7 +154,7 @@ jobs: # os: ubuntu-latest - target: x86_64-apple-darwin - os: macos-latest + os: macos-13 - target: aarch64-apple-darwin os: macos-14