From a941c5247f0403c1b24b244d77626c27935ab9fb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 8 May 2024 15:56:13 +0200 Subject: [PATCH 1/2] gha: update to use macos-13, macos-14 macos-11 runners are being deprecated; updating to use macos-13 (x86) and macos-14 (arm64) Signed-off-by: Sebastiaan van Stijn --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c86f5d9..5481b99d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,8 @@ jobs: os: - ubuntu-22.04 - ubuntu-20.04 - - macOS-11 + - macOS-14 + - macOS-13 - windows-2022 steps: - From 0c43fede6dd16079462bcfaa899da12f6e128290 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 8 May 2024 15:58:27 +0200 Subject: [PATCH 2/2] update to go1.21.10 Signed-off-by: Sebastiaan van Stijn --- .github/workflows/build.yml | 2 +- Dockerfile | 2 +- deb/Dockerfile | 2 +- docker-bake.hcl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5481b99d..1e7ae1e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ on: env: DESTDIR: ./bin - GO_VERSION: 1.21.6 + GO_VERSION: 1.21.10 jobs: validate: diff --git a/Dockerfile b/Dockerfile index 7bf255e6..06cfe40f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.21.6 +ARG GO_VERSION=1.21.10 ARG XX_VERSION=1.4.0 ARG OSXCROSS_VERSION=11.3-r7-debian ARG GOLANGCI_LINT_VERSION=v1.55.2 diff --git a/deb/Dockerfile b/deb/Dockerfile index ae27517d..5f617e0c 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG GO_VERSION=1.21.6 +ARG GO_VERSION=1.21.10 ARG DISTRO=ubuntu ARG SUITE=focal diff --git a/docker-bake.hcl b/docker-bake.hcl index db192b91..c72103a5 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,5 +1,5 @@ variable "GO_VERSION" { - default = "1.21.6" + default = "1.21.10" } # Defines the output folder