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

chore(deps): Bump go version to 1.21.1 (backport #2541) #2543

Merged
merged 1 commit into from
Sep 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2023

This is an automatic backport of pull request #2541 done by Mergify.
Cherry-pick of cb82cc3 has failed:

On branch mergify/bp/v1.x/pr-2541
Your branch is up to date with 'origin/v1.x'.

You are currently cherry-picking commit cb82cc3.
  (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:   .github/workflows/ci-release.yml
	modified:   .github/workflows/lint.yml
	modified:   .github/workflows/test.yml
	modified:   README.md
	modified:   go.mod

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/nightly.yml

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Bump Go version to 1.21.1 because QGB repo can't depend on celestia-app
due to:

```
go: module github.com/celestiaorg/quantum-gravity-bridge/v2@v2.1.1 requires go >= 1.21.1; switching to go1.21.1
```

(cherry picked from commit cb82cc3)

# Conflicts:
#	.github/workflows/nightly.yml
@mergify mergify bot added the conflicts label Sep 19, 2023
@celestia-bot celestia-bot requested a review from a team September 19, 2023 15:47
@github-actions github-actions bot added the bot item was created by a bot label Sep 19, 2023
Copy link
Member

@rach-id rach-id left a comment

Choose a reason for hiding this comment

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

Mergify say that the cherry-pick failed, however, the changes seem to be fine. Should I cherry-pick manually locally? Or just leave it like this?

Copy link
Collaborator

@rootulp rootulp left a comment

Choose a reason for hiding this comment

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

It looks like the nightly workflow wasn't backported to v1.x yet

.github/workflows/nightly.yml Show resolved Hide resolved
@rootulp
Copy link
Collaborator

rootulp commented Sep 19, 2023

Mergify say that the cherry-pick failed, however, the changes seem to be fine. Should I cherry-pick manually locally? Or just leave it like this?

Agreed but I think Mergify is just bugging out b/c there are no merge conflicts. Both this PR and the original PR modify 6 files so IMO this looks good.

Copy link
Member

@rach-id rach-id left a comment

Choose a reason for hiding this comment

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

cool, thanks. Approving

@rach-id rach-id merged commit 6071680 into v1.x Sep 20, 2023
21 of 23 checks passed
@rach-id rach-id deleted the mergify/bp/v1.x/pr-2541 branch September 20, 2023 10:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants