diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a65a6607..d496cb50 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,6 @@ updates: schedule: interval: monthly groups: - all-depenencies: + all-dependencies: patterns: - "*" diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 0d5f12ef..b4da7015 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -49,36 +49,20 @@ jobs: uses: actions/checkout@v4 - name: Setup Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.target }} - override: true + uses: dtolnay/rust-toolchain@stable - - uses: actions-rs/install@v0.1 - with: - crate: trunk - version: latest - use-tool-cache: true - if: matrix.target == 'wasm32-unknown-unknown' - - - uses: actions-rs/install@v0.1 - with: - crate: wasm-bindgen-cli - version: latest - use-tool-cache: true + - run: cargo install trunk wasm-bindgen-cli if: matrix.target == 'wasm32-unknown-unknown' - run: sudo apt install musl-tools if: startsWith(matrix.os, 'ubuntu') && matrix.target != 'wasm32-unknown-unknown' - name: cargo build - uses: actions-rs/cargo@v1 + uses: houseabsolute/actions-rust-cross@v0 with: command: build - args: --release --locked --target=${{ matrix.target }} - use-cross: ${{ matrix.cross }} - if: matrix.target != 'wasm32-unknown-unknown' + args: --release --locked ${{ matrix.cargo_flags }} + target: ${{ matrix.target }} - name: trunk build run: trunk build --release @@ -91,10 +75,10 @@ jobs: - name: Compress binaries uses: svenstaro/upx-action@v2 with: - file: target/${{ matrix.target }}/release/genact${{ env.EXE }} + files: target/${{ matrix.target }}/release/genact${{ env.EXE }} args: --best --lzma strip: false # We're stripping already in Cargo.toml - if: matrix.target != 'wasm32-unknown-unknown' && matrix.target != 'x86_64-unknown-freebsd' + if: matrix.target != 'wasm32-unknown-unknown' && matrix.target != 'x86_64-unknown-freebsd' && matrix.target != 'x86_64-apple-darwin' - name: Upload artifact uses: actions/upload-artifact@v4