diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index c3140933d575..9be7ca7987fe 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" @@ -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 @@ -86,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 ./... @@ -122,7 +121,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 +195,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