From 4c63cea062faaf3cd9d2342e34248dba5400ffb1 Mon Sep 17 00:00:00 2001
From: Tim Peeters <timpeeters@users.noreply.github.com>
Date: Wed, 20 Nov 2024 11:02:39 +0100
Subject: [PATCH] Fix #221 by bumping Go. (#223)

* Fix #221 by bumping Go.

* CI: use golang:latest instead of GoReleaser's container image

* Add Go linker flag (-B gobuildid) to generate UUID.

---------

Co-authored-by: Nikolay Edigaryev <edigaryev@gmail.com>
---
 .cirrus.yml     | 8 +++++++-
 .goreleaser.yml | 1 +
 Dockerfile      | 6 +++++-
 go.mod          | 4 +---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 96acc09..43e30a2 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -28,15 +28,21 @@ task:
     GORELEASER_KEY: ENCRYPTED[!9b80b6ef684ceaf40edd4c7af93014ee156c8aba7e6e5795f41c482729887b5c31f36b651491d790f1f668670888d9fd!]
     FURY_TOKEN: ENCRYPTED[!97fe4497d9aca60a3d64904883b81e21f19706c6aedda625c97f62f67ec46b8efa74c55699956158bbf0a23726e7d9f6!]
   container:
-    image: goreleaser/goreleaser-pro:latest
+    image: golang:latest
     cpu: 4
     memory: 12G
   matrix:
     - name: Release Binaries
       only_if: $CIRRUS_TAG != ''
+      install_goreleaser_script:
+        - echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list
+        - apt update && apt -y install goreleaser-pro
       release_script: goreleaser
     - name: Release Binaries (Dry Run)
       only_if: $CIRRUS_TAG == ''
+      install_goreleaser_script:
+        - echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list
+        - apt update && apt -y install goreleaser-pro
       release_script: goreleaser release --skip=publish --snapshot --clean --verbose
       binaries_artifacts:
         path: "dist/orchard_*/orchard*"
diff --git a/.goreleaser.yml b/.goreleaser.yml
index ad5a8ea..b53d35c 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -10,6 +10,7 @@ builds:
     ldflags: >
       -X github.com/cirruslabs/orchard/internal/version.Version={{.Version}}
       -X github.com/cirruslabs/orchard/internal/version.Commit={{.ShortCommit}}
+      -B gobuildid
     env:
       - CGO_ENABLED=0
     goos:
diff --git a/Dockerfile b/Dockerfile
index c17c856..8c9bb94 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,8 @@
-FROM goreleaser/goreleaser-pro:latest as builder
+FROM golang:latest as builder
+
+# Install GoReleaser Pro
+RUN echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list
+RUN apt update && apt -y install goreleaser-pro
 
 WORKDIR /tmp/orchard
 ADD . /tmp/orchard/
diff --git a/go.mod b/go.mod
index c119db0..1716201 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/cirruslabs/orchard
 
-go 1.21
-
-toolchain go1.22.4
+go 1.23.3
 
 require (
 	github.com/avast/retry-go v3.0.0+incompatible