From e23ebec53f30ca7bd9b6a7da65a4dd5f7f73aa7e Mon Sep 17 00:00:00 2001
From: Mihail Stoykov <M.Stoikov@gmail.com>
Date: Wed, 6 Dec 2023 15:06:15 +0200
Subject: [PATCH] Revert "Pin golang version to 1.21.5 in github actions and
 docker"

This reverts commit 3808747f1629937010629adb212ccc9fcaa16918.
---
 .github/workflows/build.yml | 2 +-
 .github/workflows/lint.yml  | 2 +-
 .github/workflows/tc39.yml  | 2 +-
 .github/workflows/test.yml  | 2 +-
 .github/workflows/xk6.yml   | 2 +-
 Dockerfile                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cfe398bca03..922c7a5cbaa 100644
--- 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
index 9d269b93b10..4861ce7b047 100644
--- 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
index 01cbfbb466a..92d736e5bec 100644
--- 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
index e5d1858c7f6..b425f6f03f2 100644
--- 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
index ab5592e2b4b..dfd4906439e 100644
--- 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
index 11bbbd10a12..ac9f968b329 100644
--- 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