Skip to content

Commit 92b43bf

Browse files
committed
chore: remove git repo in trino and hbase-operator-tools to avoid maven commit plugin bug
1 parent 8dbf055 commit 92b43bf

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

hbase/Dockerfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,10 @@ WORKDIR /stackable
152152
# We need to explicitly give the uid to use
153153
RUN --mount=type=cache,id=maven-hbase-operator-tools-${HBASE_OPERATOR_TOOLS},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
154154
cd "$(/stackable/patchable --images-repo-root=src checkout hbase-operator-tools ${HBASE_OPERATOR_TOOLS})"
155-
cd hbase-hbck2
156-
git init
157-
git config user.email "[email protected]"
158-
git config user.name "Fake commiter"
159-
git commit --allow-empty --message "Fake commit, so that we can create a tag"
160-
git tag ${HBASE_OPERATOR_TOOLS}
161-
cd ..
155+
156+
# Remove the Git repo because `git-commit-id-maven-plugin` tries to get the latest commit if a Git repo is present,
157+
# which fails due to a problem with worktrees, see https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/215
158+
rm .git
162159

163160
mvn \
164161
--batch-mode \

trino/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ cd "$(/stackable/patchable --images-repo-root=src checkout trino ${PRODUCT})"
2727
# have their reasons. See e.g. https://github.com/trinodb/trino/discussions/18963.
2828
# So we fake it till we make it and create a Git repo and the correct tag. The trino-operator
2929
# smoke test checks that "select version()" is working.
30-
rm -rf .git
30+
# Also, we need to initialize a new Git repo because `git-commit-id-maven-plugin` has a problem with worktrees, see https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/215
31+
rm .git
3132
git init
3233
git config user.email "[email protected]"
3334
git config user.name "Fake commiter"

0 commit comments

Comments
 (0)