From a0bfc71a22325bacb7dc96c6d0293ece558a2fcf Mon Sep 17 00:00:00 2001 From: sweexordious Date: Tue, 8 Oct 2024 00:30:39 +0400 Subject: [PATCH 01/12] chore(ci): update buf definitions to reflect project name --- buf.yaml | 3 +++ proto/buf.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/buf.yaml b/buf.yaml index cc4aced576..df02dccdc7 100644 --- a/buf.yaml +++ b/buf.yaml @@ -1,5 +1,8 @@ version: v1beta1 +modules: + - name: buf.build/celestia/celestia-core + build: roots: - proto diff --git a/proto/buf.yaml b/proto/buf.yaml index 90988439bb..b638e285d8 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -1,5 +1,5 @@ version: v1 -name: buf.build/tendermint/tendermint +name: buf.build/celestiaorg/celestia-core deps: - buf.build/gogo/protobuf breaking: From b892a8a40c9152345cb419f213631229afb2e8a3 Mon Sep 17 00:00:00 2001 From: sweexordious Date: Tue, 8 Oct 2024 00:31:34 +0400 Subject: [PATCH 02/12] chore(ci): add workflows to push to BSR --- .github/workflows/buf-ci.yml | 20 ++++++++++++++++++++ .github/workflows/buf-release.yml | 23 +++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 .github/workflows/buf-ci.yml create mode 100644 .github/workflows/buf-release.yml diff --git a/.github/workflows/buf-ci.yml b/.github/workflows/buf-ci.yml new file mode 100644 index 0000000000..257933d4e4 --- /dev/null +++ b/.github/workflows/buf-ci.yml @@ -0,0 +1,20 @@ +name: buf-ci +on: + push: + branches: + - main + - "v[0-9]+.x" + pull_request: +permissions: + contents: read + pull-requests: write +jobs: + buf: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: bufbuild/buf-setup-action@v1 + - uses: bufbuild/buf-breaking-action@v1 + with: + against: 'https://github.com/celestiaorg/celestia-core.git#branch=main' + - uses: bufbuild/buf-lint-action@v1 diff --git a/.github/workflows/buf-release.yml b/.github/workflows/buf-release.yml new file mode 100644 index 0000000000..98832465c2 --- /dev/null +++ b/.github/workflows/buf-release.yml @@ -0,0 +1,23 @@ +name: buf-release +on: + push: + tags: + - "v*" +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: bufbuild/buf-setup-action@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + version: "1.44.0" + # Push the protobuf definitions to the BSR + - uses: bufbuild/buf-push-action@v1 + with: + buf_token: ${{ secrets.BUF_TOKEN }} + - name: "push the tag label to BSR" + run: | + set -euo pipefail + echo ${{ secrets.BUF_TOKEN }} | buf registry login --token-stdin + buf push --label ${{ github.ref_name }} From e38f89db3274dcb5d0c4c4b62899059eec90adfe Mon Sep 17 00:00:00 2001 From: sweexordious Date: Tue, 8 Oct 2024 00:33:32 +0400 Subject: [PATCH 03/12] chore(ci): remove buf.work and update buf.yaml --- buf.work.yaml | 3 --- buf.yaml | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 buf.work.yaml diff --git a/buf.work.yaml b/buf.work.yaml deleted file mode 100644 index 1878b341be..0000000000 --- a/buf.work.yaml +++ /dev/null @@ -1,3 +0,0 @@ -version: v1 -directories: - - proto diff --git a/buf.yaml b/buf.yaml index df02dccdc7..47ba34352f 100644 --- a/buf.yaml +++ b/buf.yaml @@ -1,8 +1,5 @@ version: v1beta1 - -modules: - - name: buf.build/celestia/celestia-core - +name: buf.build/celestia/celestia-core build: roots: - proto From bf80cdc7d907d4eb9b0028378d41013a99c375dd Mon Sep 17 00:00:00 2001 From: sweexordious Date: Tue, 8 Oct 2024 00:38:04 +0400 Subject: [PATCH 04/12] chore(ci): update against --- .github/workflows/buf-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buf-ci.yml b/.github/workflows/buf-ci.yml index 257933d4e4..2aa3b09412 100644 --- a/.github/workflows/buf-ci.yml +++ b/.github/workflows/buf-ci.yml @@ -16,5 +16,5 @@ jobs: - uses: bufbuild/buf-setup-action@v1 - uses: bufbuild/buf-breaking-action@v1 with: - against: 'https://github.com/celestiaorg/celestia-core.git#branch=main' + against: 'https://github.com/celestiaorg/celestia-core.git#branch=v0.34.x' - uses: bufbuild/buf-lint-action@v1 From 8d2b5eed77d6c88a8a7db6b91160aedee9281c09 Mon Sep 17 00:00:00 2001 From: sweexordious Date: Tue, 8 Oct 2024 00:38:51 +0400 Subject: [PATCH 05/12] chore(ci): update against --- .github/workflows/buf-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buf-ci.yml b/.github/workflows/buf-ci.yml index 2aa3b09412..48c5921b7d 100644 --- a/.github/workflows/buf-ci.yml +++ b/.github/workflows/buf-ci.yml @@ -16,5 +16,5 @@ jobs: - uses: bufbuild/buf-setup-action@v1 - uses: bufbuild/buf-breaking-action@v1 with: - against: 'https://github.com/celestiaorg/celestia-core.git#branch=v0.34.x' + against: 'https://github.com/celestiaorg/celestia-core.git#branch=v0.34.x-celestia' - uses: bufbuild/buf-lint-action@v1 From f3ec7320d023caab997eed3a723dc747fa382f2a Mon Sep 17 00:00:00 2001 From: CHAMI Rachid Date: Tue, 8 Oct 2024 16:35:07 +0200 Subject: [PATCH 06/12] chore: remove buf.work.yaml (#1511) deletes buf.work.yaml for the buf CI in https://github.com/celestiaorg/celestia-core/pull/1510 to work --- buf.work.yaml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 buf.work.yaml diff --git a/buf.work.yaml b/buf.work.yaml deleted file mode 100644 index 1878b341be..0000000000 --- a/buf.work.yaml +++ /dev/null @@ -1,3 +0,0 @@ -version: v1 -directories: - - proto From 8d35ffe29e76bcc32a3565a371703edeff7597f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 16:36:11 +0200 Subject: [PATCH 07/12] build(deps): Bump github.com/celestiaorg/nmt from 0.22.1 to 0.22.2 (#1512) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/celestiaorg/nmt](https://github.com/celestiaorg/nmt) from 0.22.1 to 0.22.2.
Release notes

Sourced from github.com/celestiaorg/nmt's releases.

v0.22.2

What's Changed

Full Changelog: https://github.com/celestiaorg/nmt/compare/v0.22.1...v0.22.2

Commits
  • c1a9cfc chore(deps): bump github.com/tidwall/gjson from 1.17.3 to 1.18.0 (#277)
  • b2a0187 fix(ci): update the Buf CI to push tags to the Buf Schema Registry (#280)
  • d6a3436 ci: support releasing proto definitions to BSR (#274)
  • 29e9433 docs: add comment to leaf case in verify subtree roots inclusion (#272)
  • cce31e8 chore(deps): bump github.com/tidwall/gjson from 1.17.1 to 1.17.3 (#271)
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/celestiaorg/nmt&package-manager=go_modules&previous-version=0.22.1&new-version=0.22.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9095bfeee2..c9017933ea 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/aws/aws-sdk-go v1.40.45 github.com/btcsuite/btcd/btcec/v2 v2.3.4 github.com/btcsuite/btcd/btcutil v1.1.3 - github.com/celestiaorg/nmt v0.22.1 + github.com/celestiaorg/nmt v0.22.2 github.com/cometbft/cometbft-db v0.7.0 github.com/cometbft/cometbft-load-test v0.3.0 github.com/creachadair/taskgroup v0.3.2 diff --git a/go.sum b/go.sum index ce123f3caf..6d09125897 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/celestiaorg/nmt v0.22.1 h1:t7fqoP5MJ8mBns5DB2XjfcPxQpS3CKMkY+v+BEkDxYc= -github.com/celestiaorg/nmt v0.22.1/go.mod h1:ia/EpCk0enD5yO5frcxoNoFToz2Ghtk2i+blmCRjIY8= +github.com/celestiaorg/nmt v0.22.2 h1:JmOMtZL9zWAed1hiwb9DDs+ELcKp/ZQZ3rPverge/V8= +github.com/celestiaorg/nmt v0.22.2/go.mod h1:/7huDiSRL/d2EGhoiKctgSzmLOJoWG8yEfbFtY1+Mow= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= @@ -408,8 +408,8 @@ github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= -github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U= -github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= +github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= From be45b857c6fa6a5320b465722de5b3f04f3d727c Mon Sep 17 00:00:00 2001 From: sweexordious Date: Tue, 8 Oct 2024 00:30:39 +0400 Subject: [PATCH 08/12] chore(ci): update buf definitions to reflect project name --- buf.yaml | 3 +++ proto/buf.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/buf.yaml b/buf.yaml index cc4aced576..df02dccdc7 100644 --- a/buf.yaml +++ b/buf.yaml @@ -1,5 +1,8 @@ version: v1beta1 +modules: + - name: buf.build/celestia/celestia-core + build: roots: - proto diff --git a/proto/buf.yaml b/proto/buf.yaml index 90988439bb..b638e285d8 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -1,5 +1,5 @@ version: v1 -name: buf.build/tendermint/tendermint +name: buf.build/celestiaorg/celestia-core deps: - buf.build/gogo/protobuf breaking: From 5431a5477bf9525e2c4da2f4552ce90a08bf13f2 Mon Sep 17 00:00:00 2001 From: sweexordious Date: Tue, 8 Oct 2024 00:31:34 +0400 Subject: [PATCH 09/12] chore(ci): add workflows to push to BSR --- .github/workflows/buf-ci.yml | 20 ++++++++++++++++++++ .github/workflows/buf-release.yml | 23 +++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 .github/workflows/buf-ci.yml create mode 100644 .github/workflows/buf-release.yml diff --git a/.github/workflows/buf-ci.yml b/.github/workflows/buf-ci.yml new file mode 100644 index 0000000000..257933d4e4 --- /dev/null +++ b/.github/workflows/buf-ci.yml @@ -0,0 +1,20 @@ +name: buf-ci +on: + push: + branches: + - main + - "v[0-9]+.x" + pull_request: +permissions: + contents: read + pull-requests: write +jobs: + buf: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: bufbuild/buf-setup-action@v1 + - uses: bufbuild/buf-breaking-action@v1 + with: + against: 'https://github.com/celestiaorg/celestia-core.git#branch=main' + - uses: bufbuild/buf-lint-action@v1 diff --git a/.github/workflows/buf-release.yml b/.github/workflows/buf-release.yml new file mode 100644 index 0000000000..98832465c2 --- /dev/null +++ b/.github/workflows/buf-release.yml @@ -0,0 +1,23 @@ +name: buf-release +on: + push: + tags: + - "v*" +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: bufbuild/buf-setup-action@v1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + version: "1.44.0" + # Push the protobuf definitions to the BSR + - uses: bufbuild/buf-push-action@v1 + with: + buf_token: ${{ secrets.BUF_TOKEN }} + - name: "push the tag label to BSR" + run: | + set -euo pipefail + echo ${{ secrets.BUF_TOKEN }} | buf registry login --token-stdin + buf push --label ${{ github.ref_name }} From 210040bde6560c016ea6c4cd7018dee961b90239 Mon Sep 17 00:00:00 2001 From: sweexordious Date: Tue, 8 Oct 2024 00:33:32 +0400 Subject: [PATCH 10/12] chore(ci): remove buf.work and update buf.yaml --- buf.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/buf.yaml b/buf.yaml index df02dccdc7..47ba34352f 100644 --- a/buf.yaml +++ b/buf.yaml @@ -1,8 +1,5 @@ version: v1beta1 - -modules: - - name: buf.build/celestia/celestia-core - +name: buf.build/celestia/celestia-core build: roots: - proto From ad35c5044cb42f31d6444a979cc6d1328c9ee314 Mon Sep 17 00:00:00 2001 From: sweexordious Date: Tue, 8 Oct 2024 00:38:04 +0400 Subject: [PATCH 11/12] chore(ci): update against --- .github/workflows/buf-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buf-ci.yml b/.github/workflows/buf-ci.yml index 257933d4e4..2aa3b09412 100644 --- a/.github/workflows/buf-ci.yml +++ b/.github/workflows/buf-ci.yml @@ -16,5 +16,5 @@ jobs: - uses: bufbuild/buf-setup-action@v1 - uses: bufbuild/buf-breaking-action@v1 with: - against: 'https://github.com/celestiaorg/celestia-core.git#branch=main' + against: 'https://github.com/celestiaorg/celestia-core.git#branch=v0.34.x' - uses: bufbuild/buf-lint-action@v1 From d44d8d2d982e116d4f90ee2a1fdefff5f9759614 Mon Sep 17 00:00:00 2001 From: sweexordious Date: Tue, 8 Oct 2024 00:38:51 +0400 Subject: [PATCH 12/12] chore(ci): update against --- .github/workflows/buf-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buf-ci.yml b/.github/workflows/buf-ci.yml index 2aa3b09412..48c5921b7d 100644 --- a/.github/workflows/buf-ci.yml +++ b/.github/workflows/buf-ci.yml @@ -16,5 +16,5 @@ jobs: - uses: bufbuild/buf-setup-action@v1 - uses: bufbuild/buf-breaking-action@v1 with: - against: 'https://github.com/celestiaorg/celestia-core.git#branch=v0.34.x' + against: 'https://github.com/celestiaorg/celestia-core.git#branch=v0.34.x-celestia' - uses: bufbuild/buf-lint-action@v1