From 61e6990ab36793c723824800ef18572f36ce4492 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 2 Nov 2024 19:00:02 +0100 Subject: [PATCH] fix: pin xgo to 1.22.x Hopefully resolves build issues like https://drone.kolaente.de/vikunja/vikunja/8996/3/10 (cherry picked from commit de1eac5d368b17b22cc649476e866f0ecbf94c92) --- .drone.yml | 12 ++++++------ Dockerfile | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index ff7949275..0254ab1c9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -580,7 +580,7 @@ steps: event: [ push, tag, pull_request ] - name: before-static-build - image: techknowlogick/xgo:latest + image: techknowlogick/xgo:go-1.22.x pull: always commands: - export PATH=$PATH:$GOPATH/bin @@ -589,7 +589,7 @@ steps: depends_on: [ fetch-tags, mage ] - name: static-build-windows - image: techknowlogick/xgo:latest + image: techknowlogick/xgo:go-1.22.x pull: always environment: # This path does not exist. However, when we set the gopath to /go, the build fails. Not sure why. @@ -605,7 +605,7 @@ steps: - frontend-build - name: static-build-linux - image: techknowlogick/xgo:latest + image: techknowlogick/xgo:go-1.22.x pull: always environment: # This path does not exist. However, when we set the gopath to /go, the build fails. Not sure why. @@ -621,7 +621,7 @@ steps: - frontend-build - name: static-build-darwin - image: techknowlogick/xgo:latest + image: techknowlogick/xgo:go-1.22.x pull: always environment: # This path does not exist. However, when we set the gopath to /go, the build fails. Not sure why. @@ -647,7 +647,7 @@ steps: - ./mage-static release:compress - name: after-build-static - image: techknowlogick/xgo:latest + image: techknowlogick/xgo:go-1.22.x pull: always depends_on: - after-build-compress @@ -1352,6 +1352,6 @@ steps: - failure --- kind: signature -hmac: eff6e40dc763fa1395078daaabcbef2aaa74fe0a36818a87e89015dbc4e9dae4 +hmac: 75759b487ff5f815f3ca3d77e824f7d1d70a9c07d03967f62a00217f421a81d0 ... diff --git a/Dockerfile b/Dockerfile index af0868cf3..9760b0310 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN corepack enable && \ pnpm install && \ pnpm run build -FROM --platform=$BUILDPLATFORM techknowlogick/xgo:go-1.21.x AS apibuilder +FROM --platform=$BUILDPLATFORM techknowlogick/xgo:go-1.22.x AS apibuilder RUN go install github.com/magefile/mage@latest && \ mv /go/bin/mage /usr/local/go/bin