Skip to content

Commit d4bab22

Browse files
committed
fixup: Move run script and fix update flake command name
1 parent 8d74f94 commit d4bab22

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.github/check-license-headers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"clippy.toml",
5555
"**/tests/compile_*/**",
5656
"justfile",
57-
"run-just.sh",
57+
"scripts/run-just.sh",
5858
],
5959
}
6060
]

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@ jobs:
251251
- uses: DeterminateSystems/nix-installer-action@786fff0690178f1234e4e1fe9b536e94f5433196 #v20
252252
- uses: DeterminateSystems/magic-nix-cache-action@565684385bcd71bad329742eefe8d12f2e765b39 #v13
253253
- name: Check that FFI flake is up-to-date
254-
run: ./run-just.sh check-ffi-flake
254+
run: ./scripts/run-just.sh check-ffi-flake
255255
- name: Test nix build of Golang FFI bindings
256-
run: ./run-just.sh test-ffi-nix
256+
run: ./scripts/run-just.sh test-ffi-nix
257257

258258
firewood-ethhash-differential-fuzz:
259259
needs: build

justfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# List available recipes
22
default:
3-
@just --list
3+
./scripts/run-just.sh --list
44

55
# Build ffi with nix
66
build-ffi-nix: check-nix
@@ -22,8 +22,10 @@ check-clean-branch:
2222

2323
# Check if the FFI flake (requires clean git tree)
2424
check-ffi-flake: check-nix
25-
./run-just.sh update-check-ffi-flake
26-
./run-just.sh check-clean-branch
25+
#!/usr/bin/env bash
26+
set -euo pipefail
27+
./scripts/run-just.sh update-ffi-flake
28+
./scripts/run-just.sh check-clean-branch
2729

2830
# Check if nix is installed
2931
check-nix:
@@ -75,7 +77,7 @@ test-ffi-nix-go-bindings: build-ffi-nix
7577
GOEXPERIMENT=cgocheck2 TEST_FIREWOOD_HASH_MODE=ethhash ${GO} test ./...
7678

7779
# Ensure the FFI flake is up-to-date
78-
update-check-ffi-flake: check-nix
80+
update-ffi-flake: check-nix
7981
#!/usr/bin/env bash
8082
set -euo pipefail
8183
cd ffi

run-just.sh renamed to scripts/run-just.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -euo pipefail
44
if command -v just &> /dev/null; then
55
exec just "$@"
66
elif command -v nix &> /dev/null; then
7-
exec nix run ./ffi#just -- "$@"
7+
exec nix run nixpkgs#just -- "$@"
88
else
99
echo "Error: Neither 'just' nor 'nix' is installed." >&2
1010
echo "" >&2

0 commit comments

Comments
 (0)