From 180396c5a30bfbf53bac06143c059e6b1f04e9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Fri, 24 Nov 2023 14:03:09 +0100 Subject: [PATCH] build: revert back to Go 1.20 --- .changelog/1346.fixed.txt | 1 + .github/workflows/dev_builds.yml | 2 +- .github/workflows/pull_requests.yml | 2 +- .github/workflows/release_builds.yml | 2 +- .github/workflows/workflow-build.yml | 2 +- .github/workflows/workflow-test.yml | 2 +- Dockerfile_local | 2 +- vagrant/provision.sh | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 .changelog/1346.fixed.txt diff --git a/.changelog/1346.fixed.txt b/.changelog/1346.fixed.txt new file mode 100644 index 0000000000..cd3c420bef --- /dev/null +++ b/.changelog/1346.fixed.txt @@ -0,0 +1 @@ +build: revert back to Go 1.20 \ No newline at end of file diff --git a/.github/workflows/dev_builds.yml b/.github/workflows/dev_builds.yml index 9d38caed65..1b6415cd08 100644 --- a/.github/workflows/dev_builds.yml +++ b/.github/workflows/dev_builds.yml @@ -11,7 +11,7 @@ defaults: shell: bash env: - GO_VERSION: "~1.21.4" + GO_VERSION: "1.20.11" jobs: diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index 8094e26a3f..2ea2224b42 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -10,7 +10,7 @@ defaults: shell: bash env: - GO_VERSION: "~1.21.4" + GO_VERSION: "1.20.11" jobs: diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml index 09ac99171d..3ef0cb438d 100644 --- a/.github/workflows/release_builds.yml +++ b/.github/workflows/release_builds.yml @@ -18,7 +18,7 @@ defaults: shell: bash env: - GO_VERSION: "~1.21.4" + GO_VERSION: "1.20.11" jobs: diff --git a/.github/workflows/workflow-build.yml b/.github/workflows/workflow-build.yml index e1a45fe8e5..b537faa297 100644 --- a/.github/workflows/workflow-build.yml +++ b/.github/workflows/workflow-build.yml @@ -28,7 +28,7 @@ defaults: shell: bash env: - GO_VERSION: "~1.21.4" + GO_VERSION: "1.20.11" jobs: build: diff --git a/.github/workflows/workflow-test.yml b/.github/workflows/workflow-test.yml index 32b6083b05..2a834fbfa3 100644 --- a/.github/workflows/workflow-test.yml +++ b/.github/workflows/workflow-test.yml @@ -28,7 +28,7 @@ defaults: shell: bash env: - GO_VERSION: "~1.21.4" + GO_VERSION: "1.20.11" jobs: test: diff --git a/Dockerfile_local b/Dockerfile_local index 9ffb14673e..9115fe0545 100644 --- a/Dockerfile_local +++ b/Dockerfile_local @@ -1,4 +1,4 @@ -FROM golang:1.21-alpine as builder +FROM golang:1.20.11-alpine as builder ADD . /src WORKDIR /src/otelcolbuilder/ ENV CGO_ENABLED=0 diff --git a/vagrant/provision.sh b/vagrant/provision.sh index 17ccb6adb1..90717ba2db 100644 --- a/vagrant/provision.sh +++ b/vagrant/provision.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export GO_VERSION="1.21.4" +export GO_VERSION="1.20.11" sudo apt update -y sudo apt install -y \