Merge remote-tracking branch 'origin/next' into jguer/local-pkgbuild-…

…install
Jguer · Nov 15, 2022 · ae91898 · ae91898
2 parents 3f7f55f + 3f5dffc
commit ae91898
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -79,6 +79,7 @@ linters:
     # - forbidigo
 
 run:
+  go: '1.18'
 
 issues:
   exclude-rules:

diff --git a/ci.Dockerfile b/ci.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/jguer/yay-builder:latest
+FROM docker.io/heywoodlh/archlinux:latest
 
 ENV GO111MODULE=on
 WORKDIR /app
@@ -7,5 +7,5 @@ COPY go.mod .
 
 RUN pacman -Sy && pacman -S --overwrite=* --noconfirm archlinux-keyring && pacman -Su --overwrite=* --needed --noconfirm go git && \
     rm -rfv /var/cache/pacman/* /var/lib/pacman/sync/* && \
-    curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.48.0 && \
+    curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.1 && \
     go mod download
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,6 +79,7 @@ linters: @@
         # - forbidigo
     run:
+      go: '1.18'
     issues:
       exclude-rules:
@@ Expand Down @@