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

Add submodule pin check to CI #2455

Merged
merged 15 commits into from
Jul 12, 2024
Merged

Conversation

Tristan-Wilson
Copy link
Member

@Tristan-Wilson Tristan-Wilson commented Jul 3, 2024

This checks that submodules are ancestors of origin/HEAD or a configurable expected branch so that non-merged branches aren't accidentally checked in.

Fixes NIT-2604

Initially this will likely FAIL because we have some submodules that are not under origin/HEAD.

Testing done

This screenshot shows an example of what you see when it fails:
Screenshot from 2024-07-09 12-36-22

This checks that submodules are ancestors of origin/HEAD so that
non-merged branches aren't accidentally checked in.
@cla-bot cla-bot bot added the s Automatically added by the CLA bot if the creator of a PR is registered as having signed the CLA. label Jul 3, 2024
@Tristan-Wilson
Copy link
Member Author

Tristan-Wilson commented Jul 3, 2024

Updated the arbitrator/langs/bf pin as it was fairly clear what to do.

For the following I need experts on these submodules to take a look
arbitrator/langs/c pin is 6 months ahead of origin/HEAD
arbitrator/langs/rust is on a branch diverging from origin/HEAD
arbitrator/tools/wasmer is ahead of origin/HEAD
contracts is several months ahead of origin/HEAD
fastcache is several months ahead of origin/HEAD

@PlasmaPower @tsahee @magicxyyz @rachel-bousfield

Co-authored-by: Gabriel de Quadros Ligneul <[email protected]>
eljobe
eljobe previously approved these changes Jul 4, 2024
Copy link
Member

@eljobe eljobe left a comment

Choose a reason for hiding this comment

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

LGTM

gligneul
gligneul previously approved these changes Jul 4, 2024
@PlasmaPower
Copy link
Collaborator

  • I merged fastcache (it was just one small change, Merge go-wasi into master fastcache#2 )
  • contracts should target the develop branch as upstream. Is it behind that?
  • For wasmer, I think @tsahee should probably review Adopt v4.2.8 wasmer#7 . It's been approved by Josh already but it's already in the nitro pin and it'd probably be good to make sure this is solid.
  • For arbitrator/langs/*, these are mainly about testing

@Tristan-Wilson Tristan-Wilson dismissed stale reviews from gligneul and eljobe via c399902 July 8, 2024 11:44
@Tristan-Wilson
Copy link
Member Author

Tristan-Wilson commented Jul 8, 2024

I merged fastcache

I made a PR to update nitro pin and will merge it back into this PR once it's merged
#2457

  • contracts should target the develop branch as upstream. Is it behind that?

We should change the default GH branch to develop instead of main and the check will pass.

gligneul
gligneul previously approved these changes Jul 9, 2024
@Tristan-Wilson Tristan-Wilson merged commit 5237c93 into master Jul 12, 2024
14 checks passed
@Tristan-Wilson Tristan-Wilson deleted the add-ci-submodule-pin-check branch July 12, 2024 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
design-approved s Automatically added by the CLA bot if the creator of a PR is registered as having signed the CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants