Revert "Pin golang version to 1.21.5 in github actions and docker"

This reverts commit 3808747.
grafana · Dec 7, 2023 · e23ebec · e23ebec
1 parent f9ee99d
commit e23ebec
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ env:
   APP_NAME: "k6"
   DOCKER_IMAGE_ID: "grafana/k6"
   GHCR_IMAGE_ID: ${{ github.repository }}
-  DEFAULT_GO_VERSION: "1.21.5"
+  DEFAULT_GO_VERSION: "1.21.x"
 
 jobs:
   configure:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.21.x
           check-latest: true
       - name: Check dependencies
         run: |

diff --git a/.github/workflows/tc39.yml b/.github/workflows/tc39.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.21.x
           check-latest: true
       - name: Run tests
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -87,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.21.5]
+        go-version: [1.21.x]
         platform: [ubuntu-latest, windows-2019]
     runs-on: ${{ matrix.platform }}
     steps:

diff --git a/.github/workflows/xk6.yml b/.github/workflows/xk6.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.21.x
           check-latest: true
       - name: Install Go tip
         if: matrix.go == 'tip'

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.21.5-alpine3.18 as builder
+FROM --platform=$BUILDPLATFORM golang:1.21-alpine3.18 as builder
 WORKDIR $GOPATH/src/go.k6.io/k6
 COPY . .
 ARG TARGETOS TARGETARCH