diff --git a/.github/workflows/.windows.yml b/.github/workflows/.windows.yml index 4c1b953512..c93531355b 100644 --- a/.github/workflows/.windows.yml +++ b/.github/workflows/.windows.yml @@ -13,10 +13,7 @@ on: default: false env: - GO_VERSION: 1.19 - # FIXME: temporarily using a separate var for this, as go-setup-action expects SemVer - # see https://github.com/actions/setup-go/tree/v3.2.0#supported-version-syntax - GO_VERSION_SEMVER: 1.19.0 + GO_VERSION: 1.19.1 GOTESTLIST_VERSION: v0.2.0 TESTSTAT_VERSION: v0.1.3 WINDOWS_BASE_IMAGE: mcr.microsoft.com/windows/servercore @@ -190,7 +187,7 @@ jobs: name: Set up Go uses: actions/setup-go@v3 with: - go-version: ${{ env.GO_VERSION_SEMVER }} + go-version: ${{ env.GO_VERSION }} - name: Download artifacts uses: actions/download-artifact@v3 @@ -218,7 +215,7 @@ jobs: name: Set up Go uses: actions/setup-go@v3 with: - go-version: ${{ env.GO_VERSION_SEMVER }} + go-version: ${{ env.GO_VERSION }} - name: Install gotestlist run: @@ -390,7 +387,7 @@ jobs: name: Set up Go uses: actions/setup-go@v3 with: - go-version: ${{ env.GO_VERSION_SEMVER }} + go-version: ${{ env.GO_VERSION }} - name: Test integration if: matrix.test == './...' @@ -480,7 +477,7 @@ jobs: name: Set up Go uses: actions/setup-go@v3 with: - go-version: ${{ env.GO_VERSION_SEMVER }} + go-version: ${{ env.GO_VERSION }} - name: Download artifacts uses: actions/download-artifact@v3 diff --git a/Dockerfile b/Dockerfile index fab448e0b6..9a021fd943 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG CROSS="false" ARG SYSTEMD="false" -ARG GO_VERSION=1.19 +ARG GO_VERSION=1.19.1 ARG DEBIAN_FRONTEND=noninteractive ARG VPNKIT_VERSION=0.5.0 diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 915b05abf6..4a98c61d9f 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.19 +ARG GO_VERSION=1.19.1 FROM golang:${GO_VERSION}-alpine AS base ENV GO111MODULE=off diff --git a/Dockerfile.simple b/Dockerfile.simple index 789e96f264..93bbd3eab8 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -5,7 +5,7 @@ # This represents the bare minimum required to build and test Docker. -ARG GO_VERSION=1.19 +ARG GO_VERSION=1.19.1 ARG BASE_DEBIAN_DISTRO="bullseye" ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}" diff --git a/Dockerfile.windows b/Dockerfile.windows index a3ddfdaa93..9afaec9759 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -165,7 +165,7 @@ FROM microsoft/windowsservercore # Use PowerShell as the default shell SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ARG GO_VERSION=1.19 +ARG GO_VERSION=1.19.1 ARG GOTESTSUM_VERSION=v1.8.1 ARG GOWINRES_VERSION=v0.2.3 ARG CONTAINERD_VERSION=v1.6.8