Ci 13178 go upgrade maltware cache (#112)

* fix: [CI-13178]: Upgraded go version imaged to 1.22.4-alpine3.19 * fix: [CI-13178]: Upgraded go version imaged to 1.22.4 * fix: [CI-13178]: Upgraded go version imaged to 1.22.4
drone-plugins · Jul 10, 2024 · ced0169 · ced0169
1 parent 1594021
commit ced0169
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 22 deletions.
diff --git a/.bingo/bingo.mod b/.bingo/bingo.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.22
+go 1.22.4
 
 require github.com/bwplotka/bingo v0.2.2
diff --git a/.bingo/embedmd.mod b/.bingo/embedmd.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.22
+go 1.22.4
 
 require github.com/campoy/embedmd v1.0.0
diff --git a/.bingo/gotest.mod b/.bingo/gotest.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.22
+go 1.22.4
 
 require github.com/rakyll/gotest v0.0.4
diff --git a/.bingo/liche.mod b/.bingo/liche.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.22
+go 1.22.4
 
 require github.com/raviqqe/liche v0.0.0-20200229003944-f57a5d1c5be4
diff --git a/.drone.yml b/.drone.yml
@@ -39,13 +39,6 @@ steps:
     environment:
       CGO_ENABLED: 0
 
-#  - name: lint
-#    image: golang:1.22
-#    pull: always
-#    commands:
-#      - go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
-#      - golangci-lint version
-#      - golangci-lint run  --timeout 500s --new-from-rev=HEAD~
 
   - name: test
     image: golang:1.22.4-alpine3.19
@@ -62,6 +55,7 @@ steps:
       - name: testdata
         path: /drone/src/tmp/testdata/cache
 
+
   - name: rebuild-cache
     image: meltwater/drone-cache:v1.1.0-rc1
     pull: always
@@ -254,15 +248,15 @@ platform:
 steps:
   - name: build-push
     pull: always
-    image: golang:1.22
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.build=${DRONE_BUILD_NUMBER}" -a -o release/linux/amd64/drone-cache'
     environment:
       CGO_ENABLED: 0
       GO111MODULE: on
   - name: build-tag
     pull: always
-    image: golang:1.22
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}" -a -o release/linux/amd64/drone-cache'
     environment:
@@ -309,15 +303,15 @@ platform:
 steps:
   - name: build-push
     pull: always
-    image: golang:1.22
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.build=${DRONE_BUILD_NUMBER}" -a -o release/linux/arm64/drone-cache'
     environment:
       CGO_ENABLED: 0
       GO111MODULE: on
   - name: build-tag
     pull: always
-    image: golang:1.22
+    image: golang:1.22.4
     commands:
       - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}" -a -o release/linux/arm64/drone-cache'
     environment:
@@ -363,7 +357,7 @@ platform:
 
 steps:
   - name: build
-    image: golang:1.22
+    image: golang:1.22.4
     commands:
       - echo $env:DRONE_SEMVER_SHORT
       - go build -o release/windows/amd64/drone-cache.exe
@@ -410,7 +404,7 @@ platform:
 
 steps:
   - name: build
-    image: golang:1.22
+    image: golang:1.22.4
     commands:
       - echo $env:DRONE_SEMVER_SHORT
       - go build -o release/windows/amd64/drone-cache.exe
@@ -486,7 +480,7 @@ pool:
 
 steps:
   - name: build
-    image: golang:1.22
+    image: golang:1.22.4
     commands:
       - GOOS=linux   GOARCH=amd64   go build -ldflags "-s -w -X main.version=${DRONE_TAG##v}" -o release/plugin-linux-amd64
       - GOOS=linux   GOARCH=arm64   go build -ldflags "-s -w -X main.version=${DRONE_TAG##v}" -o release/plugin-linux-arm64

diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64
@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine3.18 AS builder
+FROM golang:1.22.4-alpine3.19 AS builder
 RUN apk add --update --no-cache ca-certificates tzdata && update-ca-certificates
 
 FROM scratch as runner

diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64
@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine3.18 AS builder
+FROM golang:1.22.4-alpine3.19 AS builder
 RUN apk add --update --no-cache ca-certificates tzdata && update-ca-certificates
 
 FROM scratch as runner

diff --git a/go.mod b/go.mod
@@ -47,4 +47,4 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
-go 1.22
+go 1.22.4
diff --git a/key/generator/util.go b/key/generator/util.go
@@ -8,7 +8,7 @@ import (
 
 // readerHasher generic md5 hash generater from io.Reader.
 func readerHasher(readers ...io.Reader) (string, error) {
-	// Use go1.22 new hashmap functions.
+	// Use go1.22.4 new hashmap functions.
 	h := md5.New() // #nosec
 
 	for _, r := range readers {
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,4 +47,4 @@ require ( @@
     	gopkg.in/yaml.v2 v2.4.0 // indirect
     )
-    go 1.22
+    go 1.22.4