1 Commits

Author SHA1 Message Date
juanarias8
b1ad4b9803 chore(ci): update golangci-lint and fix script paths
All checks were successful
Build and test / Lint (pull_request) Successful in 1m42s
Build and test / Test (Linux) (pull_request) Successful in 1m1s
Build and test / Build (pull_request) Successful in 12s
- bump golangci-lint-action to v7 and version to v2.1.6
- correct directory paths in `smoke_test.sh`
- update `test` and `test-ci` targets in Makefile
2026-03-11 00:34:40 -05:00
2 changed files with 12 additions and 8 deletions

View File

@@ -42,10 +42,14 @@ jobs:
- name: Download dependencies - name: Download dependencies
run: go mod download run: go mod download
- name: Download tun2socks binaries
run: make download-tun2socks
- name: Install golangci-lint
run: GOTOOLCHAIN=local go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.6
- name: Lint - name: Lint
uses: golangci/golangci-lint-action@v6 run: golangci-lint run --allow-parallel-runners
with:
version: v2.1.6
test-linux: test-linux:
name: Test (Linux) name: Test (Linux)
@@ -111,4 +115,4 @@ jobs:
run: make build-ci run: make build-ci
- name: Run smoke tests - name: Run smoke tests
run: GREYWALL_TEST_NETWORK=1 ./scripts/smoke_test.sh ./greywall run: ./scripts/smoke_test.sh ./greywall

View File

@@ -25,11 +25,11 @@ GREYWALL_BIN="${1:-}"
if [[ -z "$GREYWALL_BIN" ]]; then if [[ -z "$GREYWALL_BIN" ]]; then
if [[ -x "./greywall" ]]; then if [[ -x "./greywall" ]]; then
GREYWALL_BIN="./greywall" GREYWALL_BIN="./greywall"
elif [[ -x "./dis./greywall" ]]; then elif [[ -x "./dist/greywall" ]]; then
GREYWALL_BIN="./dis./greywall" GREYWALL_BIN="./dist/greywall"
else else
echo "Building greywall..." echo "Building greywall..."
go build -o ./greywall ./cm./greywall go build -o ./greywall ./cmd/greywall
GREYWALL_BIN="./greywall" GREYWALL_BIN="./greywall"
fi fi
fi fi
@@ -121,7 +121,7 @@ run_test "read file in workspace" "pass" "$GREYWALL_BIN" -c "cat $WORKSPACE/test
# Test: Write outside workspace blocked # Test: Write outside workspace blocked
# Create a settings file that only allows write to current workspace # Create a settings file that only allows write to current workspace
SETTINGS_FILE="$WORKSPAC./greywall.json" SETTINGS_FILE="$WORKSPACE/greywall.json"
cat > "$SETTINGS_FILE" << EOF cat > "$SETTINGS_FILE" << EOF
{ {
"filesystem": { "filesystem": {