Fixes

benedikt-schesch · May 11, 2024 · ffc5db5 · ffc5db5
1 parent 4d58068
commit ffc5db5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/check-reproducibility.yml b/.github/workflows/check-reproducibility.yml
@@ -41,7 +41,7 @@ jobs:
       run: make clean
     - run: echo "LOGURU_COLORIZE=NO" >> $GITHUB_ENV
     - name: Build
-      run: cd src/scripts/merge_tools/merging && ./gradlew -q shadowJar
+      run: git submodule update --init --recursive && cd src/scripts/merge_tools/merging && ./gradlew -q shadowJar
     - name: make check-merges-reproducibility
       run: |
         git config --global user.email "[email protected]"

diff --git a/src/scripts/merge_tools/gitmerge_ort_imports.sh b/src/scripts/merge_tools/gitmerge_ort_imports.sh
@@ -17,7 +17,7 @@ git checkout "$branch1" --force
 attributes_file=".git/info/attributes"
 echo "*.java merge=merge-java" >> "$attributes_file"
 git config --local merge.merge-java.name "Merge Java files"
-git config --local merge.merge-java.driver 'java-merge-driver.sh "%A" "%O" "%B"'
+git config --local merge.merge-java.driver "${MERGE_SCRIPTS_DIR}/java-merge-driver.sh \"%A\" \"%O\" \"%B\""
 
 git merge --no-edit "$branch2"
 retVal=$?

diff --git a/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh b/src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh
@@ -18,7 +18,7 @@ git checkout "$branch1" --force
 attributes_file=".git/info/attributes"
 echo "*.java merge=merge-java" >> "$attributes_file"
 git config --local merge.merge-java.name "Merge Java files"
-git config --local merge.merge-java.driver 'java-merge-driver.sh "%A" "%O" "%B"'
+git config --local merge.merge-java.driver "${MERGE_SCRIPTS_DIR}/java-merge-driver.sh \"%A\" \"%O\" \"%B\""
 
 git merge --no-edit "$strategy" "$branch2"
 retVal=$?