From f180ae4147c8ca0b2fbd73599dcf38bb4486fd3b Mon Sep 17 00:00:00 2001 From: jsubirat Date: Wed, 13 Dec 2023 17:43:23 +0100 Subject: [PATCH] Pin Go to 1.20.12 due to https://github.com/golang/go/issues/62130 (#144) * Pin Go to 1.20.12 due to https://github.com/golang/go/issues/62130 * Go 1.20.12 image only available in bookworm and bullseye * Revert back to bullseye * Finally stuck to 1.20.7 as that's the latest version available through Chocolatey, and I prefer a consistent versioning --- .github/workflows/merge-to-master.yml | 7 ++++--- .github/workflows/pr.yaml | 7 ++++--- Dockerfile | 3 ++- Dockerfile.windows | 4 +++- Dockerfile_debug | 3 ++- Dockerfile_firelens | 3 ++- go.mod | 1 + version.go | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.github/workflows/merge-to-master.yml b/.github/workflows/merge-to-master.yml index f0c05fc2..c2d12de0 100644 --- a/.github/workflows/merge-to-master.yml +++ b/.github/workflows/merge-to-master.yml @@ -11,10 +11,11 @@ jobs: runs-on: ubuntu-20.04 steps: - - name: Set up Go ^1.20.5 - uses: actions/setup-go@v2 + # We can't go past 1.20.X until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898 + - name: Set up Go 1.20.7 + uses: actions/setup-go@v4 with: - go-version: ^1.20.5 + go-version: '1.20.7' - name: Check go version run: go version diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a5885bfd..65dbe5c7 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -8,10 +8,11 @@ jobs: runs-on: ubuntu-20.04 steps: - - name: Set up Go ^1.20.5 - uses: actions/setup-go@v2 + # We can't go past 1.20.X until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898 + - name: Set up Go 1.20.7 + uses: actions/setup-go@v4 with: - go-version: ^1.20.5 + go-version: '1.20.7' id: go - name: Check go version diff --git a/Dockerfile b/Dockerfile index 2233ecde..72f0ddc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM golang:1.20.5-buster AS builder +# We can't go past 1.20.X until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898 +FROM golang:1.20.7-bullseye AS builder WORKDIR /go/src/github.com/newrelic/newrelic-fluent-bit-output diff --git a/Dockerfile.windows b/Dockerfile.windows index a673a067..da01045d 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -28,7 +28,9 @@ RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" # Install Base Dependencies RUN choco install --yes --no-progress mingw git -RUN choco install --yes --no-progress golang --version=1.20.5 +# We can't go past 1.20.X until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898 +# The last 1.20.X version in chocolatey is 1.20.7 +RUN choco install --yes --no-progress golang --version=1.20.7 # Put the path before the other paths so that MinGW shadows Windows commands. RUN setx PATH "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw\bin;%PATH%" diff --git a/Dockerfile_debug b/Dockerfile_debug index bd4860c8..63496758 100644 --- a/Dockerfile_debug +++ b/Dockerfile_debug @@ -1,4 +1,5 @@ -FROM golang:1.20.5-buster AS builder +# We can't go past 1.20.X until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898 +FROM golang:1.20.7-bullseye AS builder WORKDIR /go/src/github.com/newrelic/newrelic-fluent-bit-output diff --git a/Dockerfile_firelens b/Dockerfile_firelens index 098f7dcb..57fc0d8c 100644 --- a/Dockerfile_firelens +++ b/Dockerfile_firelens @@ -1,4 +1,5 @@ -FROM golang:1.20.5-buster AS builder +# We can't go past 1.20.X until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898 +FROM golang:1.20.7-bullseye AS builder WORKDIR /go/src/github.com/newrelic/newrelic-fluent-bit-output diff --git a/go.mod b/go.mod index 50277e3a..07b8b1a9 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,6 @@ module github.com/newrelic/newrelic-fluent-bit-output +// We can't go past 1.20.X until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898 go 1.20 require ( diff --git a/version.go b/version.go index 1778f61f..b2c4dab7 100644 --- a/version.go +++ b/version.go @@ -1,3 +1,3 @@ package main -const VERSION = "1.19.0" +const VERSION = "1.19.1"