+
Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2025

Closes: #4785


This is an automatic backport of pull request #4805 done by Mergify.

* feat(cosmosgen): fetch fallback buf token

* package refactor

* fix `CaptureException called with nil error`

* cl

* updates

* updates

* feedback

(cherry picked from commit 3919d6b)

# Conflicts:
#	ignite/cmd/bubblemodel/chain_serve.go
#	ignite/cmd/cmd.go
#	ignite/internal/analytics/analytics.go
#	ignite/internal/announcements/announcement_test.go
#	ignite/pkg/cosmosgen/generate_typescript.go
#	ignite/pkg/gocmd/gocmd_test.go
#	ignite/templates/app/files/{{protoDir}}/buf.gen.gogo.yaml
#	ignite/templates/app/files/{{protoDir}}/buf.gen.swagger.yaml
Copy link
Contributor Author

mergify bot commented Oct 6, 2025

Cherry-pick of 3919d6b has failed:

On branch mergify/bp/release/v28.x.y/pr-4805
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit 3919d6bb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   changelog.md
	renamed:    ignite/pkg/announcements/announcement.go -> ignite/internal/announcements/announcement.go
	new file:   ignite/internal/buf/buf.go
	new file:   ignite/internal/buf/buf_test.go
	renamed:    ignite/pkg/sentry/sentry.go -> ignite/internal/sentry/sentry.go
	deleted:    ignite/pkg/announcements/announcement_test.go
	modified:   ignite/pkg/errors/xerrors.go
	modified:   ignite/pkg/gocmd/gocmd.go
	modified:   ignite/templates/app/files/proto/buf.gen.sta.yaml
	modified:   ignite/templates/app/files/proto/buf.gen.swagger.yaml
	modified:   ignite/templates/app/files/proto/buf.gen.ts.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   ignite/cmd/bubblemodel/chain_serve.go
	both modified:   ignite/cmd/cmd.go
	both modified:   ignite/internal/analytics/analytics.go
	both modified:   ignite/internal/announcements/announcement_test.go
	both modified:   ignite/pkg/cosmosgen/generate_typescript.go
	both modified:   ignite/pkg/gocmd/gocmd_test.go
	deleted by us:   ignite/templates/app/files/{{protoDir}}/buf.gen.gogo.yaml
	deleted by us:   ignite/templates/app/files/{{protoDir}}/buf.gen.swagger.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@julienrbrt julienrbrt enabled auto-merge (squash) October 6, 2025 11:36
@julienrbrt julienrbrt merged commit 990a42a into release/v28.x.y Oct 6, 2025
38 of 43 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v28.x.y/pr-4805 branch October 6, 2025 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载