Merge remote-tracking branch 'origin'

Author: ehsandeep

.github/dependabot.yml

@@ -8,7 +8,7 @@ updates:
 
   # Maintain dependencies for go modules
   - package-ecosystem: "gomod"
-    directory: "v2/"
+    directory: "/"
     schedule:
       interval: "weekly"
     target-branch: "dev"

.github/workflows/build-test.yml

@@ -27,11 +27,10 @@ jobs:
 
       - name: Build
         run: go build .
-        working-directory: v2/cmd/naabu/
+        working-directory: cmd/naabu/
 
       - name: Test
         run: go test -race ./...
-        working-directory: v2/
 
       - name: Integration Tests
         env:
@@ -42,12 +41,12 @@ jobs:
       - name: Race Condition Tests - Standard User
         run: |
           go run -race . -host scanme.sh
-        working-directory: v2/cmd/naabu/
+        working-directory: cmd/naabu/
 
       - name: Race Condition Tests - Root User
         run: |
-          sudo go run -race . -host scanme.sh -Pn
-        working-directory: v2/cmd/naabu/
+          sudo go run -race . -host scanme.sh
+        working-directory: cmd/naabu/
 
   build-mac:
     runs-on: macos-latest
@@ -68,11 +67,10 @@ jobs:
 
       - name: Build
         run: go build .
-        working-directory: v2/cmd/naabu/
+        working-directory: cmd/naabu/
 
       - name: Test
         run: go test -race ./...
-        working-directory: v2/
 
       - name: Integration Tests
         env:
@@ -83,12 +81,12 @@ jobs:
       - name: Race Condition Tests - Standard User
         run: |
           go run -race . -host scanme.sh
-        working-directory: v2/cmd/naabu/
+        working-directory: cmd/naabu/
 
       - name: Race Condition Tests - Root User
         run: |
-          sudo go run -race . -host scanme.sh -Pn
-        working-directory: v2/cmd/naabu/
+          sudo go run -race . -host scanme.sh
+        working-directory: cmd/naabu/
 
   build-windows:
     runs-on: windows-latest
@@ -103,15 +101,14 @@ jobs:
 
       - name: Build
         run: go build .
-        working-directory: v2/cmd/naabu/
+        working-directory: cmd/naabu/
 
       - name: Test
         run: go test -race ./...
-        working-directory: v2/
 
       - name: Race Condition Tests
         # Known issue: https://github.com/golang/go/issues/46099
         run: |
           # go run -race . -host scanme.sh
           # sudo go run -race . -host scanme.sh
-        working-directory: v2/cmd/naabu/
+        working-directory: cmd/naabu/

.github/workflows/functional-test.yml

@@ -39,4 +39,4 @@ jobs:
         run: |
           chmod +x run.sh
           bash run.sh
-        working-directory: v2/cmd/functional-test
+        working-directory: cmd/functional-test

.github/workflows/lint-test.yml

@@ -27,5 +27,4 @@ jobs:
         uses: golangci/golangci-lint-action@v6.1.1
         with:
           version: latest
-          args: --timeout 5m
-          working-directory: v2/
+          args: --timeout 5m

.github/workflows/release-binary.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           version: latest
           args: release -f .goreleaser/mac.yml --clean
-          workdir: v2
+          workdir: /
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -48,7 +48,7 @@ jobs:
         with:
           version: latest
           args: release -f .goreleaser/linux.yml --clean
-          workdir: v2
+          workdir: /
         env: 
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           SLACK_WEBHOOK: "${{ secrets.RELEASE_SLACK_WEBHOOK }}"
@@ -71,6 +71,6 @@ jobs:
         with:
           version: latest
           args: release -f .goreleaser/windows.yml --clean
-          workdir: v2
+          workdir: /
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-test.yml

@@ -30,7 +30,6 @@ jobs:
         with:
           args: "release --clean --snapshot -f .goreleaser/mac.yml"
           version: latest
-          workdir: v2
 
   release-test-linux:
     runs-on: ubuntu-latest-16-cores
@@ -53,7 +52,6 @@ jobs:
         with:
           args: "release --clean --snapshot -f .goreleaser/linux.yml"
           version: latest
-          workdir: v2
 
   release-test-windows:
     runs-on: windows-latest-8-cores
@@ -72,5 +70,4 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           args: "release --clean --snapshot -f .goreleaser/windows.yml"
-          version: latest
-          workdir: v2
+          version: latest

.gitignore

@@ -1,11 +1,10 @@
 cmd/naabu/naabu*
-v2/cmd/naabu/naabu*
 vendor
 integration_tests/naabu
 integration_tests/integration-test
-v2/cmd/functional-test/naabu_dev
-v2/cmd/functional-test/functional-test
-v2/cmd/functional-test/naabu
-v2/cmd/functional-test/*.cfg
+cmd/functional-test/naabu_dev
+cmd/functional-test/functional-test
+cmd/functional-test/naabu
+cmd/functional-test/*.cfg
 .vscode
 dist