From 92ff974364bdc0583e0438c5582dbce1e9105f43 Mon Sep 17 00:00:00 2001 From: storybehind Date: Wed, 20 Nov 2024 17:48:19 +0530 Subject: [PATCH 1/2] update go version --- .github/workflows/distribute-zboxcli-apt.yml | 1 - .github/workflows/distribute-zboxcli-choco.yml | 2 +- .github/workflows/release.yml | 3 ++- scripts/debian/Dockerfile.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/distribute-zboxcli-apt.yml b/.github/workflows/distribute-zboxcli-apt.yml index 6cc9bc9d..47ba6aa6 100644 --- a/.github/workflows/distribute-zboxcli-apt.yml +++ b/.github/workflows/distribute-zboxcli-apt.yml @@ -11,7 +11,6 @@ on: env: APP_NAME: zbox APP_VERSION: ${{ github.event.inputs.version }} - GO_VERSION: 1.21.0 REMOTE_SERVER: 5.9.151.246 REMOTE_USER: root diff --git a/.github/workflows/distribute-zboxcli-choco.yml b/.github/workflows/distribute-zboxcli-choco.yml index f6e6fc4a..a0adfeb7 100644 --- a/.github/workflows/distribute-zboxcli-choco.yml +++ b/.github/workflows/distribute-zboxcli-choco.yml @@ -12,7 +12,7 @@ env: APP_NAME: zbox PACKAGE_ID: zbox APP_VERSION: ${{ github.event.inputs.version }} - GO_VERSION: '1.21' + GO_VERSION: '1.22' jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38dd201a..22925d57 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ env: GITHUB_TOKEN: ${{ secrets.GOSDK }} VERSION: ${{ github.event.inputs.version }} APP_NAME: zbox - GO_VERSION: 1.21 + GO_VERSION: 1.22 jobs: create_release: @@ -74,6 +74,7 @@ jobs: docker buildx build \ --platform linux/amd64 \ --build-arg VERSION=${{ env.VERSION }} \ + --build-arg GO --tag ${{ env.APP_NAME }}-amd64 \ --load \ --output type=docker,dest=${{ env.OUTPUT_DIR }}/${{ env.APP_NAME }}-amd64.tar \ diff --git a/scripts/debian/Dockerfile.build b/scripts/debian/Dockerfile.build index 55951ffd..4ff29079 100644 --- a/scripts/debian/Dockerfile.build +++ b/scripts/debian/Dockerfile.build @@ -1,4 +1,4 @@ -FROM --platform=$TARGETPLATFORM golang:1.21 AS build +FROM --platform=$TARGETPLATFORM golang:1.22 AS build ARG VERSION WORKDIR /src COPY go.mod go.sum . From 89e7040f78718f5086c8597b281178ddd59760a1 Mon Sep 17 00:00:00 2001 From: storybehind Date: Wed, 20 Nov 2024 17:59:29 +0530 Subject: [PATCH 2/2] fix release yml --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22925d57..de45c3bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,7 +74,6 @@ jobs: docker buildx build \ --platform linux/amd64 \ --build-arg VERSION=${{ env.VERSION }} \ - --build-arg GO --tag ${{ env.APP_NAME }}-amd64 \ --load \ --output type=docker,dest=${{ env.OUTPUT_DIR }}/${{ env.APP_NAME }}-amd64.tar \