Update Go build and runtime to 1.19 (#2251)

brave-intl · Dec 13, 2023 · cfcb81e · cfcb81e
1 parent eda2bb0
commit cfcb81e
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,6 +44,7 @@ jobs:
       matrix:
         goversion:
         - 1.18
+        - 1.19
 
     steps:
     - name: Checkout repository

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.19'
       - name: golangci-lint-libs
         uses: golangci/golangci-lint-action@v3
         with:
@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.19'
       - name: golangci-lint-services
         uses: golangci/golangci-lint-action@v3
         with:
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.19'
       - name: golangci-lint-tools
         uses: golangci/golangci-lint-action@v3
         with:
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.19'
       - name: golangci-lint-cmd
         uses: golangci/golangci-lint-action@v3
         with:
@@ -79,7 +79,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.18'
+          go-version: '1.19'
       - name: golangci-lint-main
         uses: golangci/golangci-lint-action@v3
         with:

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,5 +1,5 @@
 run:
-  go: "1.17" ## TODO update to 1.18 once all linters support it
+  go: "1.19"
   timeout: 3m
 
 linters-settings:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine as builder
+FROM golang:1.19-alpine as builder
 
 # Put certs in builder image.
 RUN apk update
@@ -20,7 +20,8 @@ RUN cd main && go mod download && CGO_ENABLED=0 GOOS=linux go build \
     -ldflags "-w -s -X main.version=${VERSION} -X main.buildTime=${BUILD_TIME} -X main.commit=${COMMIT}" \
     -o bat-go main.go
 
-FROM alpine:3.15 as base
+# golang:1.19-alpine is based on alpine:3.18.
+FROM alpine:3.18 as base
 
 # Put certs in artifact from builder.
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/

diff --git a/docker-compose.dev-refresh.yml b/docker-compose.dev-refresh.yml
@@ -8,7 +8,7 @@ services:
   # every time a file changes.
   dev-refresh:
     container_name: grant-dev-refresh
-    image: golang:1.18
+    image: golang:1.19
     ports:
       - "3335:3333"
       - "6061:6061"

diff --git a/services/rewards/docker-compose.yml b/services/rewards/docker-compose.yml
@@ -39,7 +39,7 @@ services:
 
   rewards-dev-refresh:
     container_name: rewards-dev-refresh
-    image: golang:1.18
+    image: golang:1.19
     ports:
       - "3343:3343"
       - "6061:6061"

diff --git a/services/skus/docker-compose.payment-refresh.yml b/services/skus/docker-compose.payment-refresh.yml
@@ -8,7 +8,7 @@ services:
   # every time a file changes.
   payment-refresh:
     container_name: grant-payment-refresh
-    image: golang:1.18
+    image: golang:1.19
     ports:
       - "3335:3333"
       - "6061:6061"

diff --git a/services/skus/docker-compose.yml b/services/skus/docker-compose.yml
@@ -12,7 +12,7 @@ services:
   # every time a file changes.
   skus-dev-refresh:
     container_name: skus-dev-refresh
-    image: golang:1.18
+    image: golang:1.19
     ports:
       - "3353:3353"
       - "6061:6061"

diff --git a/services/wallet/docker-compose.yml b/services/wallet/docker-compose.yml
@@ -12,7 +12,7 @@ services:
   # every time a file changes.
   wallet-dev-refresh:
     container_name: wallet-dev-refresh
-    image: golang:1.18
+    image: golang:1.19
     ports:
       - "3353:3353"
       - "6061:6061"

diff --git a/tools/Dockerfile b/tools/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine as builder
+FROM golang:1.19-alpine as builder
 
 # put certs in builder image
 RUN apk update
@@ -20,7 +20,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build \
     -ldflags "-w -s -X main.version=${VERSION} -X main.buildTime=${BUILD_TIME} -X main.commit=${COMMIT}" \
     -o bat-go main.go
 
-FROM alpine:3.15 as base
+FROM alpine:3.18 as base
 # put certs in artifact from builder
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /src/bat-go /bin/
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,7 @@ jobs: @@
           matrix:
             goversion:
             - 1.18
+            - 1.19
         steps:
         - name: Checkout repository
@@ Expand Down @@