From 2aa3d4b8abe7b1e216c92ecf00b7d40048bc93d6 Mon Sep 17 00:00:00 2001 From: Clemente Date: Thu, 4 Jul 2024 18:12:37 +0200 Subject: [PATCH 1/4] use glibc toolchain in gha --- .github/workflows/pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index beeb9d53a1..f0a4ab96dc 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -136,6 +136,7 @@ jobs: -DREALM_ENABLE_SYNC=1 \ -DREALM_NO_TESTS=1 \ -DREALM_BUILD_LIB_ONLY=true \ + -DCMAKE_TOOLCHAIN_FILE=../../../external/core/tools/cmake/x86_64-linux-gnu.toolchain.cmake \ ../../src/jvm make -j8 From 3ca19b91b93e0fae21de7bc71771b55109ddfb6d Mon Sep 17 00:00:00 2001 From: Clemente Date: Fri, 5 Jul 2024 13:44:29 +0200 Subject: [PATCH 2/4] add missing include --- .github/workflows/pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f0a4ab96dc..d31cef57f4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -137,6 +137,7 @@ jobs: -DREALM_NO_TESTS=1 \ -DREALM_BUILD_LIB_ONLY=true \ -DCMAKE_TOOLCHAIN_FILE=../../../external/core/tools/cmake/x86_64-linux-gnu.toolchain.cmake \ + -DJAVA_INCLUDE_PATH=/usr/lib/jvm/java-8-openjdk-amd64/include/ \ ../../src/jvm make -j8 From f1e087241f4c631c233467e5c50b1006975d4561 Mon Sep 17 00:00:00 2001 From: Clemente Date: Fri, 5 Jul 2024 14:00:02 +0200 Subject: [PATCH 3/4] disable aws farm tests on non-releasable prs --- .github/workflows/pr.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d31cef57f4..f00a9510f8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1093,7 +1093,9 @@ jobs: always() && !cancelled() && !contains(needs.*.result, 'failure') && - !contains(needs.*.result, 'cancelled') + !contains(needs.*.result, 'cancelled') && + endsWith(needs.check-cache.outputs.version-label, '-SNAPSHOT') && + (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/releases' || github.ref == 'refs/heads/release/k2') steps: - name: Checkout code uses: actions/checkout@v3 From 77838f08f2df2997a2eb8172bb0bfe7d00af4351 Mon Sep 17 00:00:00 2001 From: Clemente Date: Fri, 5 Jul 2024 14:26:07 +0200 Subject: [PATCH 4/4] try using the JAVA HOME env --- .github/workflows/pr.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f00a9510f8..ae8d285bbe 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -113,6 +113,12 @@ jobs: path: ./packages/cinterop/build/realmLinuxBuild key: jni-linux-lib-${{ needs.check-cache.outputs.packages-sha }} + - name: Setup Java 11 + uses: actions/setup-java@v3 + with: + distribution: ${{ vars.VERSION_JAVA_DISTRIBUTION }} + java-version: ${{ vars.VERSION_JAVA }} + - name: Setup cmake uses: jwlawson/actions-setup-cmake@v1.13 with: @@ -137,7 +143,7 @@ jobs: -DREALM_NO_TESTS=1 \ -DREALM_BUILD_LIB_ONLY=true \ -DCMAKE_TOOLCHAIN_FILE=../../../external/core/tools/cmake/x86_64-linux-gnu.toolchain.cmake \ - -DJAVA_INCLUDE_PATH=/usr/lib/jvm/java-8-openjdk-amd64/include/ \ + -DJAVA_INCLUDE_PATH=${{ env.JAVA_HOME }}/include/ \ ../../src/jvm make -j8