From 17f0a84394c71609b4d496be503198e402cc1a2e Mon Sep 17 00:00:00 2001 From: Mihail Stoykov Date: Thu, 2 Jun 2022 11:39:49 +0300 Subject: [PATCH] Bump golang CI version to 1.18 --- .github/workflows/all.yml | 5 ++--- .github/workflows/arm-tests.yml | 2 +- .github/workflows/dev-release.yml | 2 +- .github/workflows/lint.yml | 3 ++- .github/workflows/tc39.yml | 2 +- .github/workflows/xk6.yml | 2 +- Dockerfile | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index d8909b61621..d1dd7c4046c 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -25,8 +25,7 @@ jobs: strategy: fail-fast: false matrix: - # We are going to keep 1.16.x version until we move the build process to 1.18.x - go-version: [1.16.x, 1.17.x] + go-version: [1.17.x] platform: [ubuntu-latest, windows-2019] runs-on: ${{ matrix.platform }} steps: @@ -156,7 +155,7 @@ jobs: uses: actions/setup-go@v2 with: # We plan to move to 1.18.x after the release of the first patch. - go-version: 1.17.x + go-version: 1.18.x - name: Install package builders env: GO111MODULE: 'off' diff --git a/.github/workflows/arm-tests.yml b/.github/workflows/arm-tests.yml index 57af7568f2f..8b88f0c2c12 100644 --- a/.github/workflows/arm-tests.yml +++ b/.github/workflows/arm-tests.yml @@ -13,7 +13,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x - name: Run tests run: | set -x diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml index d7a31818e23..fb4db0c007a 100644 --- a/.github/workflows/dev-release.yml +++ b/.github/workflows/dev-release.yml @@ -11,7 +11,7 @@ on: required: true go_version: description: 'Go version for building binaries' - default: '1.17.x' + default: '1.18.x' required: true defaults: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5d6210a6a33..7d918d0d5db 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x - name: Check dependencies run: | go version @@ -41,6 +41,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: + # up this to 1.18.x when we update teh version of golangci-lint to latest go-version: 1.17.x - name: Retrieve golangci-lint version run: | diff --git a/.github/workflows/tc39.yml b/.github/workflows/tc39.yml index 87a83c597b9..068a629e141 100644 --- a/.github/workflows/tc39.yml +++ b/.github/workflows/tc39.yml @@ -22,7 +22,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x - name: Run tests run: | set -x diff --git a/.github/workflows/xk6.yml b/.github/workflows/xk6.yml index 5360dc35266..35bf48a0b1e 100644 --- a/.github/workflows/xk6.yml +++ b/.github/workflows/xk6.yml @@ -24,7 +24,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x - name: Install Go tip if: matrix.go == 'tip' run: | diff --git a/Dockerfile b/Dockerfile index 85ebbb9d7ec..d7f99664b49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17-alpine as builder +FROM golang:1.18-alpine as builder WORKDIR $GOPATH/src/go.k6.io/k6 ADD . . RUN apk --no-cache add git