Update Dockerfiles and taskfile.yaml for golangci-lint

MichaelYuhe · Jul 30, 2024 · f764bf0 · f764bf0
1 parent 51e06d1
commit f764bf0
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 2 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -0,0 +1,12 @@
+run:
+  timeout: "5m"
+
+linters:
+  disable-all: true
+  enable:
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - unused
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -70,6 +70,12 @@ RUN wget https://github.com/sqlc-dev/sqlc/releases/download/v1.26.0/sqlc_1.26.0_
     mv ./sqlc /usr/local/bin/sqlc && \
     chmod 777 /usr/local/bin/sqlc
 
+# Install golangci-lint
+RUN wget https://github.com/golangci/golangci-lint/releases/download/v1.59.1/golangci-lint-1.59.1-linux-amd64.tar.gz && \
+    tar -xzf golangci-lint-1.59.1-linux-amd64.tar.gz && \
+    mv ./golangci-lint-1.59.1-linux-amd64/golangci-lint /usr/local/bin/golangci-lint && \
+    chmod 777 /usr/local/bin/golangci-lint
+
 # Delete the temporary directory and go to the app directory
 WORKDIR /app
 RUN rm -rf /app/temp

diff --git a/docker/Dockerfile.cicd b/docker/Dockerfile.cicd
@@ -70,6 +70,12 @@ RUN wget https://github.com/sqlc-dev/sqlc/releases/download/v1.26.0/sqlc_1.26.0_
     mv ./sqlc /usr/local/bin/sqlc && \
     chmod 777 /usr/local/bin/sqlc
 
+# Install golangci-lint
+RUN wget https://github.com/golangci/golangci-lint/releases/download/v1.59.1/golangci-lint-1.59.1-linux-amd64.tar.gz && \
+    tar -xzf golangci-lint-1.59.1-linux-amd64.tar.gz && \
+    mv ./golangci-lint-1.59.1-linux-amd64/golangci-lint /usr/local/bin/golangci-lint && \
+    chmod 777 /usr/local/bin/golangci-lint
+
 # Delete the temporary directory and go to the app directory
 WORKDIR /app
 RUN rm -rf /app/temp

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
@@ -70,6 +70,12 @@ RUN wget https://github.com/sqlc-dev/sqlc/releases/download/v1.26.0/sqlc_1.26.0_
     mv ./sqlc /usr/local/bin/sqlc && \
     chmod 777 /usr/local/bin/sqlc
 
+# Install golangci-lint
+RUN wget https://github.com/golangci/golangci-lint/releases/download/v1.59.1/golangci-lint-1.59.1-linux-amd64.tar.gz && \
+    tar -xzf golangci-lint-1.59.1-linux-amd64.tar.gz && \
+    mv ./golangci-lint-1.59.1-linux-amd64/golangci-lint /usr/local/bin/golangci-lint && \
+    chmod 777 /usr/local/bin/golangci-lint
+
 # Delete the temporary directory and go to the app directory
 WORKDIR /app
 RUN rm -rf /app/temp

diff --git a/taskfile.yaml b/taskfile.yaml
@@ -60,11 +60,21 @@ tasks:
       - go fmt ./...
       - npm run standard
 
-  test:
+  lint-only:
     cmds:
-      - task fmt
+      - task gen-db
+      - golangci-lint run ./...
+
+  test-only:
+    cmds:
+      - task gen-db
       - go test ./...
 
+  test:
+    cmds:
+      - task lint-only
+      - task test-only
+
   clean:
     cmds:
       - rm -rf ./tmp