From b47ee56ec8924f539f29a58a285d489bae430c1f Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sun, 12 Jan 2025 13:58:32 +0000 Subject: [PATCH] build: upgrade kemitix/rust v3 --- .forgejo/workflows/push-main.yml | 16 +++++++++----- .forgejo/workflows/push-next.yml | 38 ++++++++++++++++---------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.forgejo/workflows/push-main.yml b/.forgejo/workflows/push-main.yml index 16e4903..07eaa81 100644 --- a/.forgejo/workflows/push-main.yml +++ b/.forgejo/workflows/push-main.yml @@ -16,20 +16,24 @@ jobs: release-plz: name: Release-plz runs-on: docker + + container: + image: + git.kemitix.net/kemitix/rust:v3.0.0 + steps: - name: Checkout repository uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Run release-plz release-pr - uses: https://git.kemitix.net/kemitix/rust@v2.6.0 - with: - args: release-plz release-pr --backend gitea --git-token ${{ secrets.FORGEJO_TOKEN }} + run: release-plz release-pr --backend gitea --git-token ${{ secrets.FORGEJO_TOKEN }} env: CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} + - name: Run release-plz release - uses: https://git.kemitix.net/kemitix/rust@v2.6.0 - with: - args: release-plz release --backend gitea --git-token ${{ secrets.FORGEJO_TOKEN }} + run: release-plz release --backend gitea --git-token ${{ secrets.FORGEJO_TOKEN }} env: CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} + diff --git a/.forgejo/workflows/push-next.yml b/.forgejo/workflows/push-next.yml index 2d9c8ff..2d49da1 100644 --- a/.forgejo/workflows/push-next.yml +++ b/.forgejo/workflows/push-next.yml @@ -1,10 +1,13 @@ -name: Rust +name: Test on: push: - branches: ["next"] + branches: + - next pull_request: - branches: ["main"] + branches: + - main + workflow_dispatch: env: CARGO_TERM_COLOR: always @@ -13,6 +16,10 @@ jobs: build: runs-on: docker + container: + image: + git.kemitix.net/kemitix/rust:v3.0.0 + strategy: matrix: toolchain: @@ -24,29 +31,22 @@ jobs: uses: actions/checkout@v4 - name: Check TODOs - uses: kemitix/todo-checker@v1.2.0 + uses: https://git.kemitix.net/kemitix/forgejo-todo-checker@v1.3.0 - name: Machete - uses: https://git.kemitix.net/kemitix/rust@v2.6.0 - with: - args: ${{ matrix.toolchain.name }} cargo machete + run: cargo +${{ matrix.toolchain.name }} machete - name: Format - uses: https://git.kemitix.net/kemitix/rust@v2.6.0 - with: - args: ${{ matrix.toolchain.name }} cargo fmt --all -- --check + run: cargo +${{ matrix.toolchain.name }} fmt --all --check - name: Clippy - uses: https://git.kemitix.net/kemitix/rust@v2.6.0 - with: - args: ${{ matrix.toolchain.name }} cargo hack --feature-powerset clippy + run: cargo +${{ matrix.toolchain.name }} hack --feature-powerset clippy - name: Build - uses: https://git.kemitix.net/kemitix/rust@v2.6.0 - with: - args: ${{ matrix.toolchain.name }} cargo hack --feature-powerset build + run: cargo +${{ matrix.toolchain.name }} hack --feature-powerset build - name: Test - uses: https://git.kemitix.net/kemitix/rust@v2.6.0 - with: - args: ${{ matrix.toolchain.name }} cargo hack --feature-powerset test + run: cargo +${{ matrix.toolchain.name }} hack --feature-powerset test + + # - name: Mutations + # run: cargo +${{ matrix.toolchain.name }} mutants -vV --in-place