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/update libp2p branch master #6253

Merged
merged 2 commits into from May 1, 2024

Conversation

kaiserd
Copy link
Contributor

@kaiserd kaiserd commented Apr 29, 2024

changes the default branch of libp2p from unstable to master.
See vacp2p/nim-libp2p#1088

@tersec
Copy link
Contributor

tersec commented Apr 29, 2024

  • should target unstable branch of nimbus-eth2
  • it looks like all the non-gitmodule changes are artifacts of this

Copy link

github-actions bot commented Apr 29, 2024

Unit Test Results

         9 files  ±0    1 322 suites  ±0   37m 13s ⏱️ -39s
  4 981 tests ±0    4 633 ✔️ ±0  348 💤 ±0  0 ±0 
20 826 runs  ±0  20 422 ✔️ ±0  404 💤 ±0  0 ±0 

Results for commit 7d547bd. ± Comparison against base commit 1ab6f16.

♻️ This comment has been updated with latest results.

@kaiserd kaiserd changed the base branch from stable to unstable April 30, 2024 09:40
@kaiserd
Copy link
Contributor Author

kaiserd commented Apr 30, 2024

Oh sorry, I missed that. Fixed.

@tersec
Copy link
Contributor

tersec commented Apr 30, 2024

Lint failure is

Run while read -r file; do
Submodule 'vendor/nim-libp2p': '2b5319622c997ce1c80bc62c863e30f3349ee0d7' (2024-04-25 13:01:29 +0000) is more recent than latest 'master' (2023-12-18 18:04:02 +0000) (branch config: '.gitmodules')
Error: Process completed with exit code 2.

This is triggered by

branch_commit_date=$(TZ=UTC0 git -C "$file" show -s --format='%cd' --date=iso-local "refs/remotes/origin/${branch}")
if [[ "${commit_date}" > "${branch_commit_date}" ]]; then
echo "Submodule '$file': '$commit' ($commit_date) is more recent than latest '$branch' ($branch_commit_date) (branch config: '.gitmodules')"
exit 2
fi

Need to update nim-libp2p submodule itself along with this, in vendor/, because right now it's pointing to/commithash-pinned to https://github.com/vacp2p/nim-libp2p/tree/2b5319622c997ce1c80bc62c863e30f3349ee0d7 from 5 days ago where in the version of libp2p vendored it's still part of the unstable branch from which it was renamed:

commit 2b5319622c997ce1c80bc62c863e30f3349ee0d7 (grafted, HEAD, origin/unstable, origin/HEAD, unstable)
Author: Diego <diego@status.im>
Date:   Thu Apr 25 15:01:29 2024 +0200

    Revert "always allow new data be received if the recvWindow is > 0"
    
    This reverts commit 5cbb473d1b765307ee15c73f47e180ae3a81fdb3.

whereas as it notes, the most recent master commit before the recent libp2p branch reorganization was from last year. So this change and the module update/bump need to happen mutually/internally consistently.

@@ -24,7 +24,7 @@
path = vendor/nim-libp2p
url = https://github.com/vacp2p/nim-libp2p.git
ignore = untracked
branch = unstable
branch = master
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not pointing to the default branch, but instead to the one that should be used for building. If we should no longer use unstable version of libp2p, have to checkout a different ref

Copy link
Contributor

Choose a reason for hiding this comment

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

That was the intent; the vacuous bump there now enforces/ensures this gets picked up by git. libp2p is switching from unstable to master for this purpose. Before master hadn't been updating enough to make it worthwhile; now it will.

@kaiserd
Copy link
Contributor Author

kaiserd commented May 1, 2024

I added an empty commit to libp2p and did a dummy-bump in the latest commit of this PR.
This allowed pleasing the linter.

@kaiserd kaiserd requested a review from etan-status May 1, 2024 15:09
@arnetheduck arnetheduck enabled auto-merge (squash) May 1, 2024 16:39
@arnetheduck arnetheduck merged commit bd33828 into unstable May 1, 2024
13 checks passed
@arnetheduck arnetheduck deleted the chore/update-libp2p-branch-master branch May 1, 2024 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants