From 47d25d268e293162814d0cbd6120f947c6ff0e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Svantesson?= Date: Mon, 24 Jun 2024 15:52:13 +0200 Subject: [PATCH] chore: upgrade to go 1.22 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit upgrade images related to jenkins-x/jx#8670 Signed-off-by: Mårten Svantesson --- .github/workflows/jenkins-x-pr.yaml | 6 +++--- .github/workflows/jenkins-x-release.yaml | 8 ++++---- .github/workflows/jenkins-x/upload-binaries.sh | 7 +------ Dockerfile-preview | 2 +- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/jenkins-x-pr.yaml b/.github/workflows/jenkins-x-pr.yaml index 31f6290..5281a1f 100644 --- a/.github/workflows/jenkins-x-pr.yaml +++ b/.github/workflows/jenkins-x-pr.yaml @@ -7,21 +7,21 @@ jobs: - env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} name: jx-variables - uses: docker://ghcr.io/jenkins-x/jx-boot:3.2.157 + uses: docker://ghcr.io/jenkins-x/jx-boot:3.10.150 with: args: gitops variables entrypoint: jx - env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} name: build-make-linux - uses: docker://golang:1.19.5 + uses: docker://golang:1.22.3 with: args: -c "make linux" entrypoint: /bin/sh - env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} name: build-make-test - uses: docker://golang:1.19.5 + uses: docker://golang:1.22.3 with: args: -c "make test" entrypoint: /bin/sh diff --git a/.github/workflows/jenkins-x-release.yaml b/.github/workflows/jenkins-x-release.yaml index 1f1b637..8a65470 100644 --- a/.github/workflows/jenkins-x-release.yaml +++ b/.github/workflows/jenkins-x-release.yaml @@ -22,7 +22,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }} VERSION: ${{ steps.prep.outputs.version }} name: release-binary - uses: docker://golang:1.19.5 + uses: docker://golang:1.22.3 with: args: -c "make release" entrypoint: bash @@ -31,7 +31,7 @@ jobs: REPO_NAME: ${{ github.event.repository.name }} VERSION: ${{ steps.prep.outputs.version }} name: changelog - uses: docker://ghcr.io/jenkins-x/jx-changelog:0.0.43 + uses: docker://ghcr.io/jenkins-x/jx-boot:3.10.150 with: entrypoint: .github/workflows/jenkins-x/changelog.sh - env: @@ -39,7 +39,7 @@ jobs: REPOSITORY: ${{ github.repository }} VERSION: ${{ steps.prep.outputs.version }} name: upload-binaries - uses: docker://goreleaser/goreleaser:v1.8.3 + uses: docker://ghcr.io/jenkins-x/jx-goreleaser-image:0.2.2@sha256:77a7c9b281e8dba01f77d0d46c5bd9834a7bd435570f3396a03bfe63554f03f0 with: entrypoint: .github/workflows/jenkins-x/upload-binaries.sh - name: Set up QEMU @@ -70,7 +70,7 @@ jobs: VERSION: ${{ steps.prep.outputs.version }} XDG_CONFIG_HOME: /github/home/.config name: promote-release - uses: docker://ghcr.io/jenkins-x/jx-updatebot:0.0.84 + uses: docker://ghcr.io/jenkins-x/jx-updatebot:0.4.22 with: entrypoint: jx-updatebot args: pr --git-credentials diff --git a/.github/workflows/jenkins-x/upload-binaries.sh b/.github/workflows/jenkins-x/upload-binaries.sh index 938506c..d412558 100755 --- a/.github/workflows/jenkins-x/upload-binaries.sh +++ b/.github/workflows/jenkins-x/upload-binaries.sh @@ -21,12 +21,7 @@ git push origin v$VERSION export BRANCH=$(git rev-parse --abbrev-ref HEAD) export BUILDDATE=$(date) export REV=$(git rev-parse HEAD) -export GOVERSION="1.17.9" +export GOVERSION="1.22.3" export ROOTPACKAGE="github.com/$REPOSITORY" -# Install syft in this script -curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | \ -sh -s -- -b /usr/local/bin v0.54.0 -chmod +x /usr/local/bin/syft - goreleaser release diff --git a/Dockerfile-preview b/Dockerfile-preview index a9fc0f3..2a8b3b1 100644 --- a/Dockerfile-preview +++ b/Dockerfile-preview @@ -1,3 +1,3 @@ -FROM ghcr.io/jenkins-x/jx-boot:3.2.199 +FROM ghcr.io/jenkins-x/jx-boot:3.10.150 COPY ./build/linux/jx-promote /usr/bin/jx-promote \ No newline at end of file