From 5560a2183344c6f2e120c2a418604bad3af82a5e Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Wed, 29 Jan 2025 11:38:17 +0400 Subject: [PATCH 1/5] unclog release --- .changelog/v1.0.2/summary.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/v1.0.2/summary.md diff --git a/.changelog/v1.0.2/summary.md b/.changelog/v1.0.2/summary.md new file mode 100644 index 0000000..f8a87c6 --- /dev/null +++ b/.changelog/v1.0.2/summary.md @@ -0,0 +1,3 @@ +*January 29, 2025* + +This release bumps the Go version to 1.23.5. From 37e86420ed369ebe996b510bcc571a8f1749ce15 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Wed, 29 Jan 2025 11:38:33 +0400 Subject: [PATCH 2/5] unclog build --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a40afe3..00f1cea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## v1.0.2 + +*January 29, 2025* + +This release bumps the Go version to 1.23.5. + ## v1.0.1 *September 23, 2024* From da6ed30834ae198e6598f21faa14ed3c818639e8 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Wed, 29 Jan 2025 11:51:25 +0400 Subject: [PATCH 3/5] fix CI job --- .github/workflows/ci-fast.yml | 47 -------------------------------- .github/workflows/ci.yml | 50 ++++++++++++++++++++++++++++------- tools/Dockerfile | 3 +++ 3 files changed, 44 insertions(+), 56 deletions(-) delete mode 100644 .github/workflows/ci-fast.yml diff --git a/.github/workflows/ci-fast.yml b/.github/workflows/ci-fast.yml deleted file mode 100644 index 06dbca5..0000000 --- a/.github/workflows/ci-fast.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Test fast (no changes to Dockerfile) - -on: - pull_request: - merge_group: - push: - branches: - - main - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} - -jobs: - test-fast: - runs-on: ubuntu-latest - container: cometbft/cometbft-db-testing - steps: - - uses: actions/checkout@v4 - - - name: Configure Git Safe Directory - run: git config --global --add safe.directory /__w/cometbft-db/cometbft-db - - - id: filter - uses: dorny/paths-filter@v3 - with: - filters: | - tools: - - "tools/**" - - - run: echo "GO_VERSION=$(cat .github/workflows/go-version.env | grep GO_VERSION | cut -d '=' -f2)" >> $GITHUB_ENV - if: steps.filter.outputs.tools == 'false' - - - uses: actions/setup-go@v5 - if: steps.filter.outputs.tools == 'false' - with: - go-version: ${{ env.GO_VERSION }} - - - name: test & coverage report creation - if: steps.filter.outputs.tools == 'false' - run: | - NON_INTERACTIVE=1 make test-all-with-coverage - - - uses: codecov/codecov-action@v4 - if: steps.filter.outputs.tools == 'false' - with: - file: ./coverage.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 890d869..f2883b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,25 +1,57 @@ -# To run locally: -# make docker-test - -name: Test +name: Test fast (no changes to Dockerfile) on: pull_request: - paths: - - tools/Dockerfile merge_group: push: branches: - main - paths: - - tools/Dockerfile concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} jobs: - Test: + check-container: + runs-on: ubuntu-latest + outputs: + exists: ${{ steps.check.outputs.exists }} + steps: + - name: Check if Docker image exists + id: check + run: | + if docker manifest inspect cometbft/cometbft-db-testing:v1.0.2 &>/dev/null; then + echo "exists=true" >> $GITHUB_OUTPUT + else + echo "exists=false" >> $GITHUB_OUTPUT + fi + + test-fast: + needs: check-container + if: needs.check-container.outputs.exists == 'true' + runs-on: ubuntu-latest + container: cometbft/cometbft-db-testing:v1.0.2 + steps: + - uses: actions/checkout@v4 + + - name: Configure Git Safe Directory + run: git config --global --add safe.directory /__w/cometbft-db/cometbft-db + + - uses: actions/setup-go@v5 + with: + go-version: ${{ env.GO_VERSION }} + + - name: test & coverage report creation + run: | + NON_INTERACTIVE=1 make test-all-with-coverage + + - uses: codecov/codecov-action@v4 + with: + file: ./coverage.txt + + test-slow: + needs: check-container + if: needs.check-container.outputs.exists == 'false' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/tools/Dockerfile b/tools/Dockerfile index e1a7060..e54edf2 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -7,6 +7,9 @@ # updates here, merge the changes here first and let the image get updated (or # push a new version manually) before PRs that depend on them. +# PLEASE BUMP THE VERSION OF THE IMAGE IN `.github/workflows/ci.yml` WHEN YOU +# MODIFY THIS FILE. + FROM golang:1.23.5 AS build ENV LD_LIBRARY_PATH=/usr/local/lib From d236d6fc8d0c1cc375b9bdc059585b590d58bb6a Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Wed, 29 Jan 2025 11:56:18 +0400 Subject: [PATCH 4/5] update description --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2883b1..da2b255 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Test fast (no changes to Dockerfile) +name: Test on: pull_request: @@ -27,6 +27,7 @@ jobs: fi test-fast: + name: Test fast (no changes to Dockerfile) needs: check-container if: needs.check-container.outputs.exists == 'true' runs-on: ubuntu-latest @@ -50,6 +51,7 @@ jobs: file: ./coverage.txt test-slow: + name: Test slow (changes to Dockerfile) needs: check-container if: needs.check-container.outputs.exists == 'false' runs-on: ubuntu-latest From 37993d44c795eb2965078f9aac617259380a538c Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Wed, 29 Jan 2025 11:59:26 +0400 Subject: [PATCH 5/5] Revert "update description" This reverts commit d236d6fc8d0c1cc375b9bdc059585b590d58bb6a. --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da2b255..f2883b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Test +name: Test fast (no changes to Dockerfile) on: pull_request: @@ -27,7 +27,6 @@ jobs: fi test-fast: - name: Test fast (no changes to Dockerfile) needs: check-container if: needs.check-container.outputs.exists == 'true' runs-on: ubuntu-latest @@ -51,7 +50,6 @@ jobs: file: ./coverage.txt test-slow: - name: Test slow (changes to Dockerfile) needs: check-container if: needs.check-container.outputs.exists == 'false' runs-on: ubuntu-latest