fix: Ensure fresh linting

aerospike · Oct 9, 2024 · fc9f0e1 · fc9f0e1
1 parent 7858d39
commit fc9f0e1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/golangci.lint.yml b/.github/workflows/golangci.lint.yml
@@ -16,6 +16,8 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
+        with:
+          submodules: true
       - name: Get go version from go.mod
         run: |
           echo "GO_VERSION=$(grep '^go ' go.mod | cut -d " " -f 2)" >> $GITHUB_ENV
@@ -25,5 +27,7 @@ jobs:
             go-version: 1.22
       - name: Run Lint
         run: |
-          make golanci-lint | make go-lint
+          make remove-lint
+          make golanci-lint
+          make go-lint
 
diff --git a/.golangci.yml b/.golangci.yml
@@ -63,5 +63,5 @@ issues:
   exclude-dirs:
     - testdata
     - .git
-    - schema
+    - schema/schemas
 
diff --git a/Makefile b/Makefile
@@ -35,14 +35,22 @@ $(ACONFIG_BIN): $(SOURCES)
 GOLANGCI_LINT ?= $(GOBIN)/golangci-lint
 GOLANGCI_LINT_VERSION ?= v1.61.0
 
+# install golangci-lint
 .PHONY: golanci-lint
 golanci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
 $(GOLANGCI_LINT): $(GOBIN)
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) $(GOLANGCI_LINT_VERSION)
 
+# Run linting in verbose
+.PHONY: go-lint
 go-lint: golanci-lint ## Run golangci-lint against code.
 	$(GOLANGCI_LINT) run -c .golangci.yml -v
 
+# Clean up golangci-lint
+.PHONY: remove-lint
+remove-lint:
+	$(RM) ${GOBIN}/golangci-lint
+
 # Clean up
 .PHONY: clean
 clean: