Merge b916f66c8410cb892616dc99992dc6fd9d1f4b7e into 52f66b05e624233105924906f67f10347a5ed0de

update golangci-lint version to 1.56 (#4013 )
Fix Dockerfiles
2025-05-11 17:38:26 +00:00 · 2024-02-21 17:20:45 +08:00 · 2024-02-21 17:20:40 +08:00 · 2024-02-06 23:51:00 -06:00
4 changed files with 4 additions and 4 deletions
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@ -23,7 +23,7 @@ jobs:
      uses: golangci/golangci-lint-action@v4
      with:
        # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-        version: v1.55
+        version: v1.56

        # Optional: golangci-lint command line arguments.
        # args: --issues-exit-code=0
--- a/.golangci.yml
+++ b/.golangci.yml
@ -1,5 +1,5 @@
 service:
-  golangci-lint-version: 1.55.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.56.x # use the fixed version to not introduce new linters unexpectedly
  
 run:
  concurrency: 4
--- a/dockerfiles/Dockerfile-for-frpc
+++ b/dockerfiles/Dockerfile-for-frpc
@ -7,6 +7,6 @@ RUN make frpc

 FROM alpine:3

-COPY --from=building /building/bin/frpc /usr/bin/frpc
+COPY --from=building /building/frpc /usr/bin/frpc

 ENTRYPOINT ["/usr/bin/frpc"]
--- a/dockerfiles/Dockerfile-for-frps
+++ b/dockerfiles/Dockerfile-for-frps
@ -7,6 +7,6 @@ RUN make frps

 FROM alpine:3

-COPY --from=building /building/bin/frps /usr/bin/frps
+COPY --from=building /building/frps /usr/bin/frps

 ENTRYPOINT ["/usr/bin/frps"]
Author	SHA1	Message	Date
David Hume	a190c2fc53	Merge b916f66c8410cb892616dc99992dc6fd9d1f4b7e into 52f66b05e624233105924906f67f10347a5ed0de	2024-02-21 17:20:45 +08:00
fatedier	52f66b05e6	update golangci-lint version to 1.56 (#4013 )	2024-02-21 17:20:40 +08:00
Xeno	b916f66c84	Fix Dockerfiles	2024-02-06 23:51:00 -06:00