From 5b1aef24ca072d7bdfa23cf61571977d02b0722b Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 12 Sep 2025 13:35:41 +0200 Subject: [PATCH 1/4] Produce Linux arm64 binaries as well --- .github/workflows/early-access.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index 25c60c65d..d8a45ea48 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -79,8 +79,8 @@ jobs: strategy: fail-fast: false matrix: - # binaries wanted: linux amd64, mac M1, mac intel, windows x86 - os: [ ubuntu-latest, macos-latest, macos-13, windows-latest ] + # binaries wanted: linux amd64, linux arm64, mac arm64, mac amd64, windows amd64 + os: [ ubuntu-latest, ubuntu-latest-arm, macos-latest, macos-13, windows-latest ] runs-on: ${{ matrix.os }} steps: From 1cd517a9cd7a22ed22ca563c0fe0e4ea6656c40a Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 12 Sep 2025 13:46:24 +0200 Subject: [PATCH 2/4] Name images explicitly --- .github/workflows/early-access.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index d8a45ea48..29b0f8c95 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -80,7 +80,8 @@ jobs: fail-fast: false matrix: # binaries wanted: linux amd64, linux arm64, mac arm64, mac amd64, windows amd64 - os: [ ubuntu-latest, ubuntu-latest-arm, macos-latest, macos-13, windows-latest ] + # note: do not use "latest" but explicit versions instead + os: [ ubuntu-24.04, ubuntu-24.04-arm, macos-15, macos-13, windows-2025 ] runs-on: ${{ matrix.os }} steps: From c76295d91de03b3aacfe23b22c9da55250f79f29 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 12 Sep 2025 14:31:52 +0200 Subject: [PATCH 3/4] WIP --- .github/workflows/early-access.yaml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index 29b0f8c95..0af225530 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -136,8 +136,8 @@ jobs: - name: 'Maven clean' run: ./mvnw clean -Dmrm=false -V -B -ntp -e - - name: 'Patch GraalVM libs for only requiring glibc 2.12' - if: ${{ env.OS == 'linux' }} + - name: '(amd64) Patch GraalVM libs for only requiring glibc 2.12' + if: ${{ env.OS == 'linux' && env.ARCH == 'amd64' }} shell: bash run: | mkdir -p client/target/graalvm-libs-for-glibc-2.12 @@ -157,6 +157,27 @@ jobs: ld -r /lib/x86_64-linux-gnu/Scrt1.o client/target/dynamic-libc-start.o -o client/target/graalvm-libs-for-glibc-2.12/Scrt1.o objcopy --redefine-syms=client/src/main/resources/glibc/glibc.redef client/target/graalvm-libs-for-glibc-2.12/Scrt1.o 2>/dev/null + - name: '(arm64) Patch GraalVM libs for only requiring glibc 2.12' + if: ${{ env.OS == 'linux' && env.ARCH == 'aarch64' }} + shell: bash + run: | + mkdir -p client/target/graalvm-libs-for-glibc-2.12 + + : patch common libraries + ( find "$GRAALVM_HOME/lib/static/linux-arm64/glibc" -name '*.a' + ls -1 /lib/aarch64-linux-gnu/libz.a + ls -1 "$GRAALVM_HOME/lib/svm/clibraries/linux-arm64/libjvm.a" + ls -1 "$GRAALVM_HOME/lib/svm/clibraries/linux-arm64/liblibchelper.a" + ) | while IFS= read -r input; do + output="client/target/graalvm-libs-for-glibc-2.12/$(basename -- "$input")" + objcopy --redefine-syms=client/src/main/resources/glibc/glibc.redef -- "$input" "$output" 2>/dev/null + done + + : patch gcc startfile + gcc -O3 -Os -Wall -Wextra -Werror -Wconversion -Wsign-conversion -Wcast-qual -pedantic -c -o client/target/dynamic-libc-start.o client/src/main/resources/glibc/dynamic-libc-start.c + ld -r /lib/aarch64-linux-gnu/Scrt1.o client/target/dynamic-libc-start.o -o client/target/graalvm-libs-for-glibc-2.12/Scrt1.o + objcopy --redefine-syms=client/src/main/resources/glibc/glibc.redef client/target/graalvm-libs-for-glibc-2.12/Scrt1.o 2>/dev/null + - name: 'Build native distribution' run: ./mvnw verify -Pnative -Dmrm=false -V -B -ntp -e -s .mvn/release-settings.xml From 144091e3a0799e77f654fd742f39e14b85238081 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 12 Sep 2025 14:34:27 +0200 Subject: [PATCH 4/4] WIP --- .github/workflows/early-access.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml index 0af225530..84e93adc4 100644 --- a/.github/workflows/early-access.yaml +++ b/.github/workflows/early-access.yaml @@ -164,10 +164,10 @@ jobs: mkdir -p client/target/graalvm-libs-for-glibc-2.12 : patch common libraries - ( find "$GRAALVM_HOME/lib/static/linux-arm64/glibc" -name '*.a' + ( find "$GRAALVM_HOME/lib/static/linux-aarch64/glibc" -name '*.a' ls -1 /lib/aarch64-linux-gnu/libz.a - ls -1 "$GRAALVM_HOME/lib/svm/clibraries/linux-arm64/libjvm.a" - ls -1 "$GRAALVM_HOME/lib/svm/clibraries/linux-arm64/liblibchelper.a" + ls -1 "$GRAALVM_HOME/lib/svm/clibraries/linux-aarch64/libjvm.a" + ls -1 "$GRAALVM_HOME/lib/svm/clibraries/linux-aarch64/liblibchelper.a" ) | while IFS= read -r input; do output="client/target/graalvm-libs-for-glibc-2.12/$(basename -- "$input")" objcopy --redefine-syms=client/src/main/resources/glibc/glibc.redef -- "$input" "$output" 2>/dev/null