Skip to content

Commit

Permalink
Merge pull request #658 from svenstaro/modernize-ci
Browse files Browse the repository at this point in the history
Get rid of deprecation warnings
  • Loading branch information
svenstaro committed Jun 2, 2024
2 parents 13d2535 + 9c931a9 commit df24371
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ updates:
schedule:
interval: monthly
groups:
all-depenencies:
all-dependencies:
patterns:
- "*"
30 changes: 7 additions & 23 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
crate: trunk
version: latest
use-tool-cache: true
if: matrix.target == 'wasm32-unknown-unknown'

- uses: actions-rs/[email protected]
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
Expand All @@ -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
Expand Down

0 comments on commit df24371

Please sign in to comment.