From 2f477e3765518c54696a2d35c0b5cef597c000ba Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Sat, 28 Jun 2025 22:01:36 -0400 Subject: [PATCH 1/6] internal: fix typo in ci & switch rust-toolchain action --- .github/workflows/rust.yml | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 9282ff46..5c75eb3b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -68,7 +68,7 @@ jobs: uses: actions/checkout@v4 - name: Update apt repositories - if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'arm-unknown-linux-gnueabihf' + if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'aarch64-unknown-linux-gnu' run: sudo apt-get update - name: Install AArch64 target toolchain @@ -80,12 +80,9 @@ jobs: run: sudo apt-get install musl-tools - name: Install Toolchain - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 # pin@oxide/master + uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable with: - toolchain: stable - target: ${{ matrix.target }} - profile: minimal - override: true + targets: ${{ matrix.target }} - name: Cache uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2 @@ -231,16 +228,12 @@ jobs: uses: actions/checkout@v4 - name: Install Toolchain - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 # pin@oxide/master + uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable + with: + components: clippy, rustfmt - name: Cache - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2 - - - name: Install Rust Fmt - run: rustup component add rustfmt - - - name: Install Clippy - run: rustup component add clippy + uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2 - name: Get Clippy Version run: cargo clippy --version @@ -259,7 +252,7 @@ jobs: uses: actions/checkout@v4 - name: Install Toolchain - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 # pin@oxide/master + uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable - name: Cache uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2 From 405b8f42acf3506db901679d0c20642fa4d9a26a Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Sat, 28 Jun 2025 22:02:34 -0400 Subject: [PATCH 2/6] fix --- .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 5c75eb3b..4e0df2ba 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -233,7 +233,7 @@ jobs: components: clippy, rustfmt - name: Cache - uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2 + uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2 - name: Get Clippy Version run: cargo clippy --version From c66e20ca523e5b6bf2c8bdb00395d79d2caa86e2 Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Sat, 28 Jun 2025 22:05:35 -0400 Subject: [PATCH 3/6] fix --- .github/workflows/rust.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4e0df2ba..811745e9 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -229,12 +229,16 @@ jobs: - name: Install Toolchain uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable - with: - components: clippy, rustfmt - name: Cache uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2 + - name: Install Rust Fmt + run: rustup component add rustfmt + + - name: Install Clippy + run: rustup component add clippy + - name: Get Clippy Version run: cargo clippy --version From 3917c91ff0e45b58b710464e8958d803c51d1b85 Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Sat, 28 Jun 2025 22:08:45 -0400 Subject: [PATCH 4/6] fix --- .github/workflows/rust.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 811745e9..c953712d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -82,6 +82,7 @@ jobs: - name: Install Toolchain uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable with: + toolchain: 1.88.0 targets: ${{ matrix.target }} - name: Cache @@ -229,16 +230,13 @@ jobs: - name: Install Toolchain uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable + with: + toolchain: 1.88.0 + components: clippy, rustfmt - name: Cache uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2 - - name: Install Rust Fmt - run: rustup component add rustfmt - - - name: Install Clippy - run: rustup component add clippy - - name: Get Clippy Version run: cargo clippy --version @@ -257,6 +255,8 @@ jobs: - name: Install Toolchain uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable + with: + toolchain: 1.88.0 - name: Cache uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2 From f537ad959718174bd949980757812878ca44276d Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Sat, 28 Jun 2025 22:17:03 -0400 Subject: [PATCH 5/6] fix --- .github/workflows/rust.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c953712d..d4caf50d 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -91,8 +91,13 @@ jobs: - name: Build run: RUSTFLAGS="${{ matrix.rustflags }}" cargo build --target ${{ matrix.target }} --release - - name: Rename artifact - run: mv target/${{ matrix.target }}/release/squawk* target/release/${{ matrix.artifact_name }} + - name: Rename artifact (windows) + if: matrix.target == 'x86_64-pc-windows-msvc' + run: mv target/${{ matrix.target }}/release/squawk.exe target/release/${{ matrix.artifact_name }} + + - name: Rename artifact (linux, mac) + if: matrix.target != 'x86_64-pc-windows-msvc' + run: mv target/${{ matrix.target }}/release/squawk target/release/${{ matrix.artifact_name }} - name: Artifact uses: actions/upload-artifact@v4 From ec3fed61385600005180a3f3d4768d95e4436270 Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Sat, 28 Jun 2025 22:23:28 -0400 Subject: [PATCH 6/6] fix windows? --- .github/workflows/rust.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d4caf50d..850acce0 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -90,6 +90,7 @@ jobs: - name: Build run: RUSTFLAGS="${{ matrix.rustflags }}" cargo build --target ${{ matrix.target }} --release + shell: bash - name: Rename artifact (windows) if: matrix.target == 'x86_64-pc-windows-msvc'