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.

Sign up for GitHub

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

Jump to bottom

fix(docker): edk2-stable202408 missing submodule #392

Merged
merged 4 commits into from
Nov 11, 2024
Merged

fix(docker): edk2-stable202408 missing submodule #392

merged 4 commits into from
Nov 11, 2024

Conversation

AtomicFS
Copy link
Collaborator

@AtomicFS AtomicFS commented Nov 7, 2024 •
edited
Loading

replace edk2-stable202408 with edk2-stable202408.01 to fix the missing git submodule

fixes #385

@github-actions github-actions bot added docker docker related bugfix Bugfix / fix module/edk2 labels Nov 7, 2024
@AtomicFS AtomicFS force-pushed the fix/edk2-stable202408 branch 2 times, most recently from 33821f2 to 7bed316 Compare November 7, 2024 16:55
@AtomicFS AtomicFS marked this pull request as ready for review November 7, 2024 16:55
@AtomicFS AtomicFS requested a review from MDr164 as a code owner November 7, 2024 16:55
@AtomicFS
Copy link
Collaborator Author

AtomicFS commented Nov 7, 2024 •
edited
Loading

running out of disk-space ... yet again :(

UPDATE: Fixed with shallow submodules

@AtomicFS AtomicFS force-pushed the fix/edk2-stable202408 branch 2 times, most recently from 936e10a to 876a03d Compare November 8, 2024 10:04
@AtomicFS
Copy link
Collaborator Author

AtomicFS commented Nov 8, 2024 •
edited
Loading

I don't know why sometimes it can find make and sometimes not. Maybe #394 will fix it.

UPDATE: I do not see this problem anymore, so it seems to be resolved.

@AtomicFS AtomicFS mentioned this pull request Nov 8, 2024
Merged
@AtomicFS
Copy link
Collaborator Author

AtomicFS commented Nov 8, 2024 •
edited
Loading

what the heck, now another edk2 build is failing #397

This was referenced Nov 11, 2024
Merged
Merged
AtomicFS and others added 3 commits November 11, 2024 13:18
@AtomicFS
fix(docker)!: edk2-stable202408 missing submodule
eb891d1 
- replace edk2-stable202408 with edk2-stable202408.01 to fix the missing
  git submodule
- [issue 385](#385)

Signed-off-by: AtomicFS <vojtech_vesely@white-hat-hacker.icu>
@AtomicFS
fix(docker/edk2): possibly broken docker arguments
aa2f1e5 
Signed-off-by: AtomicFS <vojtech_vesely@white-hat-hacker.icu>
@AtomicFS
fix(docker/edk2): shallow submodules
e3ec52c 
Signed-off-by: AtomicFS <vojtech.vesely@9elements.com>
@AtomicFS
Copy link
Collaborator Author

UPDATE on #397: I can clone Edk2 repo with all of the submodules without any issue. The problem happens when executed inside the dagger CI, this also happens when run locally with

go-task containers:build:container-edk2-stable202008

@MDr164
Copy link
Collaborator

MDr164 commented Nov 11, 2024

UPDATE on #397: I can clone Edk2 repo with all of the submodules without any issue. The problem happens when executed inside the dagger CI, this also happens when run locally with

go-task containers:build:container-edk2-stable202008

I can reproduce the failure locally as well. Maybe a typo somewhere?

@AtomicFS
Copy link
Collaborator Author

From my experiments it seems that the Edk2 submodules, on this specific commits, do not play well with shallow init. When I remove the shallow init it magically works again.

@AtomicFS
fix(docker/edk2): shallow submodules for edk2-stable202008
696722a 
- for some reason edk2-stable202008 fails to clone all of the git
  submodules when shallow recursive init is used
- so to fix this we need to add IF ELSE statement to not use shallow
  clone on git submodules for edk2-stable202008
- shame on you ekd2, shame on you

Signed-off-by: AtomicFS <vojtech.vesely@9elements.com>
@AtomicFS
Copy link
Collaborator Author

OK, I made ugly-ass fix with IF ELSE condition.

If edk2-stable202008 then do not shallow clone git submodules. I also left salty commit message.

MDr164
MDr164 approved these changes Nov 11, 2024
View reviewed changes
Copy link
Collaborator

@MDr164 MDr164 left a comment

Choose a reason for hiding this comment

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

Not really a fan of the fix but I also don't have any better idea so

@AtomicFS AtomicFS added this pull request to the merge queue Nov 11, 2024
@AtomicFS
Copy link
Collaborator Author

I do not like the fix either, hence the salty commit message

Merged via the queue into main with commit a46ffb7 Nov 11, 2024
89 checks passed
@AtomicFS AtomicFS deleted the fix/edk2-stable202408 branch November 11, 2024 15:41
@AtomicFS AtomicFS mentioned this pull request Nov 12, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MDr164 MDr164 MDr164 approved these changes

Assignees
No one assigned
Labels
bugfix Bugfix / fix docker docker related module/edk2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

edk2 container build for edk2-stable202408 fails
2 participants
@AtomicFS @MDr164