From b707e308469e5068aca3864c6b02e9082a21f9e8 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Fri, 28 Feb 2025 12:09:09 +0400 Subject: [PATCH 1/6] ci: docker: fix unrecognized named-value (#247) ``` The workflow is not valid. Unrecognized named-value: 'matrix'. Located at position 1 within expression: matrix.platform .github/workflows/docker.yml (Line: 78, Col: 14): Unexpected symbol: 'digest-linux/amd64'. Located at position 34 within expression: needs.build-image-at-tag.outputs.digest-linux/amd64 ``` --- .github/workflows/docker.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index eb51257..3064b8f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,7 +33,7 @@ jobs: platform: linux/arm64 runs-on: ${{ matrix.os }} outputs: - digest-${{ matrix.platform }}: ${{ steps.build.outputs.digest }} + digest_${{ matrix.platform }}: ${{ steps.build.outputs.digest }} steps: - uses: actions/checkout@v4 with: @@ -78,13 +78,13 @@ jobs: run: | docker buildx imagetools create \ --tag ${{ env.ORG }}/${{ env.IMAGE_NAME }}:${{ env.DOCKER_TAG }} \ - ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest-linux/amd64 }} \ - ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest-linux/arm64 }} + ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_linux_amd64 }} \ + ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_linux_arm64 }} - name: Tag and Push Latest (if applicable) if: ${{ inputs.is_latest == true }} run: | docker buildx imagetools create \ --tag ${{ env.ORG }}/${{ env.IMAGE_NAME }}:latest \ - ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest-linux/amd64 }} \ - ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest-linux/arm64 }} + ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_linux_amd64 }} \ + ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_linux_arm64 }} From 0193c1e8f80b9032e751b7a6f1a3db133f9fa9a3 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Fri, 28 Feb 2025 13:03:10 +0400 Subject: [PATCH 2/6] ci: docker: fix Unrecognized named-value (#248) ``` The workflow is not valid. Unrecognized named-value: 'matrix'. Located at position 1 within expression: matrix.platform ``` --- .github/workflows/docker.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3064b8f..9fc8422 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,7 +33,8 @@ jobs: platform: linux/arm64 runs-on: ${{ matrix.os }} outputs: - digest_${{ matrix.platform }}: ${{ steps.build.outputs.digest }} + digest_amd64: ${{ steps.build.outputs.digest }} + digest_arm64: ${{ steps.build.outputs.digest }} steps: - uses: actions/checkout@v4 with: @@ -78,13 +79,13 @@ jobs: run: | docker buildx imagetools create \ --tag ${{ env.ORG }}/${{ env.IMAGE_NAME }}:${{ env.DOCKER_TAG }} \ - ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_linux_amd64 }} \ - ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_linux_arm64 }} + ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_amd64 }} \ + ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_arm64 }} - name: Tag and Push Latest (if applicable) if: ${{ inputs.is_latest == true }} run: | docker buildx imagetools create \ --tag ${{ env.ORG }}/${{ env.IMAGE_NAME }}:latest \ - ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_linux_amd64 }} \ - ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_linux_arm64 }} + ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_amd64 }} \ + ${{ env.ORG }}/${{ env.IMAGE_NAME }}@${{ needs.build-image-at-tag.outputs.digest_arm64 }} From 8202b6635c2eeb9cf9bd67a1e17cb65059cbdae3 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Fri, 28 Feb 2025 20:48:04 +0400 Subject: [PATCH 3/6] ci: docker: do not override digest (#249) --- .github/workflows/docker.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9fc8422..1849062 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -29,12 +29,14 @@ jobs: include: - os: ubuntu-24.04 platform: linux/amd64 + platform_short: amd64 - os: ubuntu-24.04-arm platform: linux/arm64 + platform_short: arm64 runs-on: ${{ matrix.os }} outputs: - digest_amd64: ${{ steps.build.outputs.digest }} - digest_arm64: ${{ steps.build.outputs.digest }} + digest_amd64: ${{ steps.build-amd64.outputs.digest }} + digest_arm64: ${{ steps.build-arm64.outputs.digest }} steps: - uses: actions/checkout@v4 with: @@ -52,7 +54,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push image - id: build + id: build-${{ matrix.platform_short }} uses: docker/build-push-action@v6 with: platforms: ${{ matrix.platform }} From 2e0c38fda86c18c43e75d29ca3cada5f70d153ec Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 3 Mar 2025 10:07:22 +0400 Subject: [PATCH 4/6] ci: docker: correctly handle outputs (#250) * Revert "ci: docker: do not override digest (#249)" This reverts commit 8202b6635c2eeb9cf9bd67a1e17cb65059cbdae3. * ci: docker: correct handling of outputs --- .github/workflows/docker.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1849062..3d434fe 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -14,7 +14,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} + cancel-in-progress: true env: ORG: cometbft @@ -29,14 +29,14 @@ jobs: include: - os: ubuntu-24.04 platform: linux/amd64 - platform_short: amd64 + arch: amd64 - os: ubuntu-24.04-arm platform: linux/arm64 - platform_short: arm64 + arch: arm64 runs-on: ${{ matrix.os }} outputs: - digest_amd64: ${{ steps.build-amd64.outputs.digest }} - digest_arm64: ${{ steps.build-arm64.outputs.digest }} + digest_amd64: ${{ steps.capture-digest.outputs.digest_amd64 }} + digest_arm64: ${{ steps.capture-digest.outputs.digest_arm64 }} steps: - uses: actions/checkout@v4 with: @@ -54,7 +54,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push image - id: build-${{ matrix.platform_short }} + id: build uses: docker/build-push-action@v6 with: platforms: ${{ matrix.platform }} @@ -62,6 +62,11 @@ jobs: tags: | ${{ env.ORG }}/${{ env.IMAGE_NAME }}:${{ env.GIT_TAG }} push: true + outputs: type=image,name=${{ env.ORG }}/${{ env.IMAGE_NAME }},digest=true + + - name: Capture Image Digest + id: capture-digest + run: echo "digest_${{ matrix.arch }}=${{ steps.build.outputs.digest }}" >> $GITHUB_ENV merge: runs-on: ubuntu-latest From 15419162d2f683cbf699c28c00f473b686b3ab56 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 3 Mar 2025 11:27:17 +0400 Subject: [PATCH 5/6] ci: docker: use set-output to set output (#251) --- .github/workflows/docker.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3d434fe..071b46d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -66,7 +66,9 @@ jobs: - name: Capture Image Digest id: capture-digest - run: echo "digest_${{ matrix.arch }}=${{ steps.build.outputs.digest }}" >> $GITHUB_ENV + run: | + echo "digest_${{ matrix.arch }}=${{ steps.build.outputs.digest }}" >> $GITHUB_ENV + echo "::set-output name=digest_${{ matrix.arch }}::${{ steps.build.outputs.digest }}" merge: runs-on: ubuntu-latest @@ -75,6 +77,11 @@ jobs: - name: Get sanitized Docker tag run: echo "DOCKER_TAG=$(echo $GIT_TAG | sed 's/[^a-zA-Z0-9\.]/-/g')" >> $GITHUB_ENV + - name: Debug Output Digests + run: | + echo "AMD64 Digest: ${{ needs.build-image-at-tag.outputs.digest_amd64 }}" + echo "ARM64 Digest: ${{ needs.build-image-at-tag.outputs.digest_arm64 }}" + - name: Login to DockerHub if: ${{ github.event_name != 'pull_request' }} uses: docker/login-action@v3 From f1fc2f0357cc0ad61e2f1503217968244e3a5e1d Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Tue, 13 May 2025 23:13:09 +0400 Subject: [PATCH 6/6] build!: retract v1.0.2 and v1.0.3 (#255) * retract v1.0.2 and v1.0.3 * add changelog --- .../unreleased/breaking/254-go-mod-retract-v102-v103.md | 2 ++ go.mod | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changelog/unreleased/breaking/254-go-mod-retract-v102-v103.md diff --git a/.changelog/unreleased/breaking/254-go-mod-retract-v102-v103.md b/.changelog/unreleased/breaking/254-go-mod-retract-v102-v103.md new file mode 100644 index 0000000..7c05a70 --- /dev/null +++ b/.changelog/unreleased/breaking/254-go-mod-retract-v102-v103.md @@ -0,0 +1,2 @@ +- `[go.mod]` Retract v1.0.2 and v1.0.3 + ([\#254](https://github.com/cometbft/cometbft-db/issues/254)) diff --git a/go.mod b/go.mod index c751c1d..652786f 100644 --- a/go.mod +++ b/go.mod @@ -50,5 +50,8 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -// Breaking changes were released with the wrong tag (use v0.6.6 or later). -retract v0.6.5 + +retract ( + v0.6.5 // Breaking changes were released with the wrong tag (use v0.6.6 or later). + [v1.0.2, v1.0.3] // These do not have Docker images due to the broken pipeline. +)