From 66f3d2cfbbe565bae10d6c06d601907dbe10f852 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Tue, 23 Jul 2024 09:16:24 +0700 Subject: [PATCH 1/6] save --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e9b12059ff7..8cba73a6a57 100644 --- a/Makefile +++ b/Makefile @@ -277,7 +277,8 @@ install: @ls -al "$(DIST)" PACKAGE_NAME := github.com/erigontech/erigon -GOLANG_CROSS_VERSION ?= v1.22.4 +GOLANG_CROSS_VERSION ?= v1.21.5 + .PHONY: release-dry-run release-dry-run: git-submodules From 936cf71965378b57859f6f3fb70df4b9a39e2c28 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Tue, 23 Jul 2024 09:18:12 +0700 Subject: [PATCH 2/6] save --- .github/workflows/release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 029dd66579d..2084193df41 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,6 +14,11 @@ on: # to be used by fork patch-releases ^^ - 'v*.*.*-*' workflow_dispatch: + inputs: + dry_run: + description: 'Dry run' + required: true + type: boolean jobs: goreleaser: From 155a45ae533f7b63e71636fcae95df7ed7f1ca23 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Tue, 23 Jul 2024 09:20:27 +0700 Subject: [PATCH 3/6] save --- .github/workflows/release.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2084193df41..46c57569452 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,10 +59,21 @@ jobs: - run: echo ${{ steps.prepare.outputs.tag_name }} - - name: Run GoReleaser + + - if: ${{ !inputs.dry_run }} run: | make release docker images + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VERSION: ${{ steps.prepare.outputs.tag_name }} + DOCKER_USERNAME: ${{ secrets.DOCKERHUB }} + DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }} + + - if: ${{ inputs.dry_run }} + run: | + make release-dry-run + docker images env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VERSION: ${{ steps.prepare.outputs.tag_name }} From acb1981840af30ab2561c3491cb9ea67f73bb249 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Tue, 23 Jul 2024 09:32:07 +0700 Subject: [PATCH 4/6] save --- .github/workflows/release.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 46c57569452..f276afa19c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,23 +59,16 @@ jobs: - run: echo ${{ steps.prepare.outputs.tag_name }} - - - if: ${{ !inputs.dry_run }} + - name: Release dry_run=${{ inputs.dry_run }} run: | - make release + if ${{ inputs.dry_run }}; then + make release-dry-run + else + make release + fi docker images env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VERSION: ${{ steps.prepare.outputs.tag_name }} DOCKER_USERNAME: ${{ secrets.DOCKERHUB }} DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }} - - - if: ${{ inputs.dry_run }} - run: | - make release-dry-run - docker images - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - VERSION: ${{ steps.prepare.outputs.tag_name }} - DOCKER_USERNAME: ${{ secrets.DOCKERHUB }} - DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }} \ No newline at end of file From 4d5707f518202f1519008365e2aa81827f5b7f39 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Tue, 23 Jul 2024 09:35:17 +0700 Subject: [PATCH 5/6] save --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f276afa19c4..ea498f9a6d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Maximize build space - uses: AdityaGarg8/remove-unwanted-software@v1 + uses: AdityaGarg8/remove-unwanted-software@v4 with: remove-dotnet: 'true' remove-android: 'true' @@ -37,12 +37,12 @@ jobs: fetch-depth: 0 - name: dockerhub-login - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB }} password: ${{ secrets.DOCKERHUB_KEY }} - name: ghcr-login - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -55,7 +55,7 @@ jobs: echo "tag_name=${TAG}" >> $GITHUB_OUTPUT - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - run: echo ${{ steps.prepare.outputs.tag_name }} From 47e1ea4b99980f9adb3e0306da7d22832c6ec30d Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Tue, 23 Jul 2024 10:25:03 +0700 Subject: [PATCH 6/6] save --- .github/workflows/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea498f9a6d3..fc4b5146952 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,8 +15,8 @@ on: - 'v*.*.*-*' workflow_dispatch: inputs: - dry_run: - description: 'Dry run' + publish_artifacts: + description: 'Publish Artifacts (not dry-run)' required: true type: boolean @@ -59,12 +59,12 @@ jobs: - run: echo ${{ steps.prepare.outputs.tag_name }} - - name: Release dry_run=${{ inputs.dry_run }} + - name: Release publish_artifacts=${{ inputs.publish_artifacts }} run: | - if ${{ inputs.dry_run }}; then - make release-dry-run - else + if ${{ inputs.publish_artifacts }}; then make release + else + make release-dry-run fi docker images env: