Skip to content

build: un-absorb git submodules before doing OCI build#7

Merged
tycho merged 1 commit into
mainfrom
steven/oci-build-unabsorb
Apr 16, 2026
Merged

build: un-absorb git submodules before doing OCI build#7
tycho merged 1 commit into
mainfrom
steven/oci-build-unabsorb

Conversation

@tycho
Copy link
Copy Markdown
Member

@tycho tycho commented Apr 16, 2026

The worktree paths confuse the Docker builder, so replace the .git submodule stubs with the actual .git trees, without core.worktree set.

The worktree paths confuse the Docker builder.

Signed-off-by: Steven Noonan <steven@edera.dev>
@tycho tycho requested a review from bleggett April 16, 2026 19:21
Copy link
Copy Markdown
Contributor

@bleggett bleggett left a comment

Choose a reason for hiding this comment

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

submodules are annoying, but I think if you just remove all the git commands from package.sh you don't need all this.

the git clean/git resets inside the docker image aren't needed anyway, and the git tag thing at the end of package.sh can be made optional via arg (or the value passed in as an arg)

I'll approve, this also works, implementer's choice, it's just a little more wonky (to me, I wasn't aware of absorb)

@tycho tycho merged commit a975f75 into main Apr 16, 2026
2 checks passed
@tycho tycho deleted the steven/oci-build-unabsorb branch April 16, 2026 19:49
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.

2 participants