Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(chain): fix issue in release ci and command (backport #4474) #4475

Merged
merged 3 commits into from
Jan 17, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 17, 2025

Someone on discord found an issue with our release job. This fixes it.


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

* fix(chain): fix issue in release ci and command

* updates

(cherry picked from commit a0ac845)

# Conflicts:
#	ignite/pkg/archive/tar_gz.go
#	ignite/services/chain/build.go
@mergify mergify bot added the conflicts label Jan 17, 2025
Copy link
Contributor Author

mergify bot commented Jan 17, 2025

Cherry-pick of a0ac845 has failed:

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

You are currently cherry-picking commit a0ac8452.
  (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
	modified:   ignite/templates/app/files/.github/workflows/release.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ignite/pkg/archive/tar_gz.go
	both modified:   ignite/services/chain/build.go

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

Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will fix in a bit

@julienrbrt
Copy link
Member

backporting this first: #4439

@julienrbrt julienrbrt merged commit 538870f into release/v28.x.y Jan 17, 2025
41 of 43 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v28.x.y/pr-4474 branch January 17, 2025 21:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:ci CI/CD workflow and automated jobs. component:configs component:packages conflicts type:services Service-related issues.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant