Skip to content

Commit

Permalink
Pin Go to 1.20.12 due to golang/go#62130 (#144)
Browse files Browse the repository at this point in the history
* Pin Go to 1.20.12 due to golang/go#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
  • Loading branch information
jsubirat committed Dec 13, 2023
1 parent 4f99e3c commit f180ae4
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 11 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/merge-to-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 3 additions & 1 deletion Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile_debug
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 2 additions & 1 deletion Dockerfile_firelens
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package main

const VERSION = "1.19.0"
const VERSION = "1.19.1"

0 comments on commit f180ae4

Please sign in to comment.