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

dependency : update go version to 1.22.3 #753

Merged
merged 1 commit into from
May 11, 2024

Conversation

lavishpal
Copy link
Contributor

Upgrade go version to 1.22.3
Part of etcd-io/etcd#17964

@@ -26,7 +26,7 @@
- [Enhance robustness test to cover XFS](https://github.com/etcd-io/bbolt/pull/707)

### Other
- [Bump go toolchain version to 1.22.2](https://github.com/etcd-io/bbolt/pull/712)
- [Bump go toolchain version to 1.22.3](https://github.com/etcd-io/bbolt/pull/712)
Copy link
Member

Choose a reason for hiding this comment

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

v1.4.0-alpha.1 has already been released. Please revert this change, and I will take care of it later. Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
Member

@ivanvc ivanvc left a comment

Choose a reason for hiding this comment

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

LGTM, but I think we want to squash the commits before merging. Thanks @lavishpal.

@lavishpal lavishpal force-pushed the update/go-version-to-1.22.3 branch from 63c139e to 37b2daa Compare May 10, 2024 18:06
@lavishpal
Copy link
Contributor Author

LGTM, but I think we want to squash the commits before merging. Thanks @lavishpal.

Done

@lavishpal lavishpal force-pushed the update/go-version-to-1.22.3 branch 3 times, most recently from cbe5f53 to e38c515 Compare May 10, 2024 19:19
@lavishpal
Copy link
Contributor Author

cc @ivanvc , @ahrtr

@@ -16,7 +16,7 @@ permissions: read-all
jobs:
test-linux:
# this is to prevent arm64 jobs from running at forked projects
if: ${{ github.repository == 'etcd-io/bbolt' || inputs.runs-on == 'ubuntu-latest' }}
if: ${{ github.repository == 'etcd-io/bbolt' || startsWith(inputs.runs-on, 'ubuntu') }}
Copy link
Member

Choose a reason for hiding this comment

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

why you change this?

Copy link
Contributor Author

@lavishpal lavishpal May 10, 2024

Choose a reason for hiding this comment

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

why you change this?

Sorry i didn't understand or misread your previous comment.

Copy link
Member

@ivanvc ivanvc May 11, 2024

Choose a reason for hiding this comment

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

It seems like you wrongly rebased/squashed your commits. This commit is reverting 2064324

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Could you please guide me that how can I solve this?

Copy link
Member

@ivanvc ivanvc May 11, 2024

Choose a reason for hiding this comment

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

One way of solving this would be first to ensure that your branch is up to date:

git fetch origin
git rebase origin/main

Then, you could checkout the test-template.yml file from main, and amend your commit:

git checkout origin/main -- .github/workflows/tests-template.yml
git commit --amend

(Then, of course, push with -f to your branch).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done all the steps as you said.

@ivanvc
Copy link
Member

ivanvc commented May 11, 2024

/ok-to-test

@lavishpal lavishpal force-pushed the update/go-version-to-1.22.3 branch from e38c515 to 6a04aaa Compare May 11, 2024 07:27
@ahrtr ahrtr merged commit 89209af into etcd-io:main May 11, 2024
16 checks passed
@lavishpal lavishpal deleted the update/go-version-to-1.22.3 branch May 11, 2024 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants