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

Don't shallow clone submodules (revert #1064) #1143

Merged
merged 4 commits into from
Apr 6, 2022
Merged

Don't shallow clone submodules (revert #1064) #1143

merged 4 commits into from
Apr 6, 2022

Conversation

jerryz123
Copy link
Contributor

Related PRs / Issues:

Reverts #1064. Shallow clones cause myriad problems,

Type of change:

  • Bug fix
  • New feature
  • Other enhancement

Impact:

  • RTL change
  • Software change (RISC-V software)
  • Build system change
  • Other

Contributor Checklist:

  • Did you set main as the base branch?
  • Did you delete any extraneous prints/debugging code?
  • (If applicable) Did you add documentation for the feature?
  • (If applicable) Did you add a test demonstrating the PR?
  • (If applicable) Did you mark the PR as "Please Backport"?

Release Notes

@jerryz123
Copy link
Contributor Author

It appears firesim points to some backport

Copy link
Contributor

@abejgonzalez abejgonzalez left a comment

Choose a reason for hiding this comment

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

LGTM. I think we should add the option in the init-submods step to shallow clone things (can you add an issue for this) but this solves the majority of our problems.

@abejgonzalez
Copy link
Contributor

@jerryz123 is this ready to merge?

@jerryz123
Copy link
Contributor Author

Not yet. I need to check why this still seems to have some git errors in CI

@jerryz123
Copy link
Contributor Author

I don't really know why this is failing. Was not able to reproduce locally.

@DorianXGH
Copy link
Contributor

Did you manage to get the same commit hashes for the submodules ? Idk, it seems like the CI pipeline fails to find the right commits.

@abejgonzalez
Copy link
Contributor

Have you fully reverted both #1125 and #1064. Seems like you should just move the submodule init back outside the search_submodule loop to fully revert. IDK if that solves the problem but worth a shot.

@jerryz123
Copy link
Contributor Author

Those changes only affect the check-commit script? The error in CI shouldn't be related to that, (I'm looking at the prepare-chipyard jobs).

@abejgonzalez
Copy link
Contributor

Hmm. On further look, I'm also quite stumped. I've gone ahead and added some debug prints but this is still very weird.

Copy link
Contributor

@abejgonzalez abejgonzalez left a comment

Choose a reason for hiding this comment

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

Pending fix, remove my checkmark

Copy link
Contributor

@abejgonzalez abejgonzalez left a comment

Choose a reason for hiding this comment

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

This should be fixed now. I think this was some weird issue with the FireSim tests / CI that was fixed with the extra cd.

@abejgonzalez
Copy link
Contributor

The tests are failing because FireSim needs to get the libdwarf fix.

@jerryz123
Copy link
Contributor Author

jerryz123 commented Apr 5, 2022

I don't see how the firesim script would have affected the init-submodules for the chipyard-only jobs, but it looks like they work now?

@jerryz123
Copy link
Contributor Author

Do you want to just merge this and fix libdwarf in another PR?

@abejgonzalez
Copy link
Contributor

Yea it was really weird, it looked like the firesim- jobs in the workflow would run first, mess up the repository, fail, then go on to the prepare- steps. The cd helps in general but is probably not the main fix (was probably a combo of this fix + me clearing the old repos from the CI machine itself).

I think this PR is ready to merge. I think @sagark is planning on minor releasing soon which would bump FireSim in CY for the libdwarf fix.

@jerryz123
Copy link
Contributor Author

Ok. I'll merge it now then. Thanks for looking at it.

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

3 participants