From b0a34b85e6a2869d07281d5ae8299d7d9e1572d8 Mon Sep 17 00:00:00 2001
From: b5710546232 <safe.suk@gmail.com>
Date: Tue, 5 Oct 2021 12:19:24 +0700
Subject: [PATCH 1/4] Upgrade to Go 1.17

---
 .github/workflows/all.yml  | 8 ++++----
 .github/workflows/tc39.yml | 2 +-
 Dockerfile                 | 2 +-
 go.mod                     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
index c3140933d575..8441db6b14da 100644
--- a/.github/workflows/all.yml
+++ b/.github/workflows/all.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16.x
+          go-version: 1.17.x
       - name: Check dependencies
         run: |
             go version
@@ -52,7 +52,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16.x
+          go-version: 1.17.x
       - name: Install golangci-lint
         working-directory: /tmp
         run: go install "github.com/golangci/golangci-lint/cmd/golangci-lint@v$GOLANG_CI_VERSION"
@@ -122,7 +122,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -196,7 +196,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16.x
+          go-version: 1.17.x
       - name: Install package builders
         env:
           GO111MODULE: 'off'
diff --git a/.github/workflows/tc39.yml b/.github/workflows/tc39.yml
index 02e371c4f8d4..77d9d6275dd3 100644
--- a/.github/workflows/tc39.yml
+++ b/.github/workflows/tc39.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16.x
+          go-version: 1.17.x
       - name: Run tests
         run: |
           set -x
diff --git a/Dockerfile b/Dockerfile
index c6d3a38b33df..8e706beafe1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine as builder
+FROM golang:1.17-alpine as builder
 WORKDIR $GOPATH/src/go.k6.io/k6
 ADD . .
 RUN apk --no-cache add git
diff --git a/go.mod b/go.mod
index 4abc7f6fde14..1550b807edf6 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module go.k6.io/k6
 
-go 1.16
+go 1.17
 
 require (
 	github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c

From 5d3bf07ccfb23c2d4ccb9233f9106eacbefd5ee5 Mon Sep 17 00:00:00 2001
From: b5710546232 <safe.suk@gmail.com>
Date: Tue, 5 Oct 2021 18:57:16 +0700
Subject: [PATCH 2/4] Fix re-enable test-prev

---
 .github/workflows/all.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
index 8441db6b14da..247e073a5d19 100644
--- a/.github/workflows/all.yml
+++ b/.github/workflows/all.yml
@@ -66,10 +66,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.15.x]
+        go-version: [1.16.x]
         platform: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
-    if: github.ref == 'skipped' #TODO: re-enable this when Go 1.17 comes out?
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

From c7ea18992043b4694f5a1e11b8a1d6afbb6faaed Mon Sep 17 00:00:00 2001
From: b5710546232 <safe.suk@gmail.com>
Date: Tue, 5 Oct 2021 19:44:11 +0700
Subject: [PATCH 3/4] Revert go version in go.mod

---
 go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/go.mod b/go.mod
index 1550b807edf6..4abc7f6fde14 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module go.k6.io/k6
 
-go 1.17
+go 1.16
 
 require (
 	github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c

From 32b2314e968fe8320c4e37b96f3a3a4135e24b79 Mon Sep 17 00:00:00 2001
From: b5710546232 <safe.suk@gmail.com>
Date: Tue, 5 Oct 2021 20:16:32 +0700
Subject: [PATCH 4/4] Revert "Run windows test a bit in parallel"

This reverts commit 4c3571a75cc54df39237fd9b6e437eabb51f02c6.
---
 .github/workflows/all.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
index 247e073a5d19..9be7ca7987fe 100644
--- a/.github/workflows/all.yml
+++ b/.github/workflows/all.yml
@@ -85,8 +85,8 @@ jobs:
           # Run with less concurrency on Windows to minimize flakiness.
           if [[ "${{ matrix.platform }}" == windows* ]]; then
             unset args[2]
-            #args[1]="1"
-            # export GOMAXPROCS=1
+            args[1]="1"
+            export GOMAXPROCS=1
           fi
           go test "${args[@]}" -timeout 800s ./...