Skip to content

Commit 3ba5c29

Browse files
authored
Merge pull request #82 from wiktor-k/wiktor/cleanups
Use one matrix command for all targets
2 parents 04504ab + da50317 commit 3ba5c29

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.github/workflows/misc.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ jobs:
2020
timeout-minutes: 10
2121
strategy:
2222
matrix:
23-
os: [ ubuntu-latest, macos-latest ]
2423
include:
2524
- os: windows-latest
26-
windows: true
25+
script: ".\\tests\\sign-and-verify-win.bat"
26+
- os: ubuntu-latest
27+
script: ./tests/sign-and-verify.sh
28+
- os: macos-latest
29+
script: ./tests/sign-and-verify.sh
2730
runs-on: ${{ matrix.os }}
2831
steps:
2932
- uses: actions/checkout@v4
@@ -34,8 +37,4 @@ jobs:
3437
- name: Check if the example compiles
3538
run: cargo check --example key-storage
3639
- name: Run integration tests
37-
run: ./tests/sign-and-verify.sh
38-
if: ${{ ! matrix.windows }}
39-
- name: Run integration tests
40-
run: ".\\tests\\sign-and-verify-win.bat"
41-
if: ${{ matrix.windows }}
40+
run: ${{ matrix.script }}

.justfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ set dotenv-load := true
55

66
# Since this is a first recipe it's being run by default.
77
# Faster checks need to be executed first for better UX. For example
8-
98
# codespell is very fast. cargo fmt does not need to download crates etc.
9+
10+
# Perform all checks
1011
check: spelling formatting docs lints dependencies tests
1112

1213
# Checks common spelling mistakes
@@ -71,13 +72,17 @@ check-commits REFS='main..':
7172
# Fixes common issues. Files need to be git add'ed
7273
fix:
7374
#!/usr/bin/env bash
75+
set -euo pipefail
7476
if ! git diff-files --quiet ; then
7577
echo "Working tree has changes. Please stage them: git add ."
7678
exit 1
7779
fi
7880

7981
codespell --write-changes
8082
just --unstable --fmt
83+
# try to fix rustc issues
84+
cargo fix --allow-staged
85+
# try to fix clippy issues
8186
cargo clippy --fix --allow-staged
8287

8388
# fmt must be last as clippy's changes may break formatting

0 commit comments

Comments
 (0)