From b1ad4b9803baa919f598cb00240d2a8f6af74659 Mon Sep 17 00:00:00 2001
From: juanarias8 <ariasg.juandavid@gmail.com>
Date: Tue, 10 Mar 2026 20:35:56 -0500
Subject: [PATCH] chore(ci): update golangci-lint and fix script paths

- 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
---
 .gitea/workflows/main.yml | 13 ++++++++-----
 Makefile                  |  4 ++--
 scripts/smoke_test.sh     |  8 ++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml
index 2743798..9b8b90e 100644
--- a/.gitea/workflows/main.yml
+++ b/.gitea/workflows/main.yml
@@ -42,11 +42,14 @@ jobs:
       - name: Download dependencies
         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
-        uses: golangci/golangci-lint-action@v6
-        with:
-          install-mode: goinstall
-          version: v1.64.8
+        run: golangci-lint run --allow-parallel-runners
 
   test-linux:
     name: Test (Linux)
@@ -112,4 +115,4 @@ jobs:
         run: make build-ci
 
       - name: Run smoke tests
-        run: GREYWALL_TEST_NETWORK=1 ./scripts/smoke_test.sh ./greywall
+        run: ./scripts/smoke_test.sh ./greywall
diff --git a/Makefile b/Makefile
index 0b9b09b..a253e65 100644
--- a/Makefile
+++ b/Makefile
@@ -38,11 +38,11 @@ build-ci: download-tun2socks
 	$(eval GIT_COMMIT := $(shell git rev-parse HEAD 2>/dev/null || echo "unknown"))
 	$(GOBUILD) -ldflags "-s -w -X main.version=$(VERSION) -X main.buildTime=$(BUILD_TIME) -X main.gitCommit=$(GIT_COMMIT)" -o $(BINARY_NAME) -v ./cmd/greywall
 
-test:
+test: download-tun2socks
 	@echo "Running tests..."
 	$(GOTEST) -v ./...
 
-test-ci:
+test-ci: download-tun2socks
 	@echo "CI: Running tests with coverage..."
 	$(GOTEST) -v -race -coverprofile=coverage.out ./...
 
diff --git a/scripts/smoke_test.sh b/scripts/smoke_test.sh
index 811fa07..fcbac6c 100755
--- a/scripts/smoke_test.sh
+++ b/scripts/smoke_test.sh
@@ -25,11 +25,11 @@ GREYWALL_BIN="${1:-}"
 if [[ -z "$GREYWALL_BIN" ]]; then
     if [[ -x "./greywall" ]]; then
         GREYWALL_BIN="./greywall"
-    elif [[ -x "./dis./greywall" ]]; then
-        GREYWALL_BIN="./dis./greywall"
+    elif [[ -x "./dist/greywall" ]]; then
+        GREYWALL_BIN="./dist/greywall"
     else
         echo "Building greywall..."
-        go build -o ./greywall ./cm./greywall
+        go build -o ./greywall ./cmd/greywall
         GREYWALL_BIN="./greywall"
     fi
 fi
@@ -121,7 +121,7 @@ run_test "read file in workspace" "pass" "$GREYWALL_BIN" -c "cat $WORKSPACE/test
 
 # Test: Write outside workspace blocked
 # 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
 {
   "filesystem": {