Compare commits

...

2 commits
v2.4.0 ... main

Author SHA1 Message Date
1e5a6defe2 build: bump rust action to 2.4.1
All checks were successful
/ test (map[name:v1.81.0]) (push) Successful in 1m33s
/ test (map[name:stable]) (push) Successful in 2m11s
/ test (map[name:nightly]) (push) Successful in 4m19s
2024-11-14 10:38:17 +00:00
7b8d4a32df fix: revert only updating toolchain if nightly
All checks were successful
/ test (map[name:v1.81.0]) (push) Successful in 53s
/ test (map[name:stable]) (push) Successful in 4m16s
/ test (map[name:nightly]) (push) Successful in 2m28s
2024-11-14 10:31:08 +00:00
2 changed files with 8 additions and 8 deletions

View file

@ -16,31 +16,31 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Machete - name: Machete
uses: https://git.kemitix.net/kemitix/rust@v2.3.0 uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with: with:
args: cargo machete args: cargo machete
- name: Format - name: Format
uses: https://git.kemitix.net/kemitix/rust@v2.3.0 uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with: with:
args: ${{ matrix.toolchain.name }} cargo fmt --check args: ${{ matrix.toolchain.name }} cargo fmt --check
- name: Clippy - name: Clippy
uses: https://git.kemitix.net/kemitix/rust@v2.3.0 uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with: with:
args: ${{ matrix.toolchain.name }} cargo clippy args: ${{ matrix.toolchain.name }} cargo clippy
- name: Test - name: Test
uses: https://git.kemitix.net/kemitix/rust@v2.3.0 uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with: with:
args: ${{ matrix.toolchain.name }} cargo test args: ${{ matrix.toolchain.name }} cargo test
- name: Build - name: Build
uses: https://git.kemitix.net/kemitix/rust@v2.3.0 uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with: with:
args: ${{ matrix.toolchain.name }} cargo build args: ${{ matrix.toolchain.name }} cargo build
- name: Run - name: Run
uses: https://git.kemitix.net/kemitix/rust@v2.3.0 uses: https://git.kemitix.net/kemitix/rust@v2.4.1
with: with:
args: ${{ matrix.toolchain.name }} cargo run args: ${{ matrix.toolchain.name }} cargo run

View file

@ -15,8 +15,6 @@ echo "Default toolchain: ${TOOLCHAIN}"
if test "${ARGS[0]}" == "nightly"; then if test "${ARGS[0]}" == "nightly"; then
TOOLCHAIN="nightly" TOOLCHAIN="nightly"
ARGS=("${ARGS[@]:1}") ARGS=("${ARGS[@]:1}")
echo ">>> Update nightly toolchain"
rustup update "${TOOLCHAIN}"
fi fi
if test "${ARGS[0]}" == "stable"; then if test "${ARGS[0]}" == "stable"; then
TOOLCHAIN="stable" # redundant as this is the default TOOLCHAIN="stable" # redundant as this is the default
@ -28,6 +26,8 @@ if [[ "${ARGS[0]}" == v1* ]]; then
fi fi
echo "Selected toolchain: ${TOOLCHAIN}" echo "Selected toolchain: ${TOOLCHAIN}"
echo ">>> Update toolchain"
rustup update "${TOOLCHAIN}"
echo ">>> Install rustfmt and clippy" echo ">>> Install rustfmt and clippy"
rustup component add --toolchain "${TOOLCHAIN}" rustfmt clippy rustup component add --toolchain "${TOOLCHAIN}" rustfmt clippy