Merge branch 'plumelib_resolve' into update-plumelib

benedikt-schesch · Sep 10, 2024 · 58b6a90 · 58b6a90
2 parents 818d4da + 172a4f6
commit 58b6a90
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/small-test.yml b/.github/workflows/small-test.yml
@@ -10,6 +10,12 @@ jobs:
       run:
         shell: bash -l {0}
     steps:
+    - uses: graalvm/setup-graalvm@v1
+      with:
+        java-version: '21'
+        distribution: 'graalvm'
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - run: echo "GRAALVM_HOME=$GRAALVM_HOME" >> $GITHUB_ENV
     - uses: actions/setup-java@v4
       with:
         distribution: 'zulu'

diff --git a/run.sh b/run.sh
@@ -125,7 +125,7 @@ if [ ! -f ./src/scripts/merge_tools/merging/.git ] ; then
     git submodule update --init --recursive
 fi
 
-(cd ./src/scripts/merge_tools/merging && JAVA_HOME=$JAVA17_HOME ./gradlew shadowJar)
+(cd ./src/scripts/merge_tools/merging && JAVA_HOME=$GRAALVM_HOME PATH="$JAVA_HOME/bin:$PATH" ./gradlew nativeCompile)
 
 echo "Machine ID: $machine_id"
 echo "Number of machines: $num_machines"