Skip to content

Commit 6b562a0

Browse files
committed
feat: migrate to 24.04 to match x86. add missing profile to client.pom for arm64
1 parent 6daba52 commit 6b562a0

File tree

3 files changed

+36
-5
lines changed

3 files changed

+36
-5
lines changed

.github/workflows/early-access.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
fail-fast: false
6464
matrix:
6565
# binaries wanted: linux amd64, mac M1, mac intel, windows x86
66-
os: [ ubuntu-24.04, ubuntu-22.04-arm, macos-15, macos-15-intel, windows-2025 ]
66+
os: [ ubuntu-24.04, ubuntu-24.04-arm, macos-15, macos-15-intel, windows-2025 ]
6767
runs-on: ${{ matrix.os }}
6868

6969
steps:
@@ -162,7 +162,7 @@ jobs:
162162
run: |
163163
(( 4 == "$(ldd client/target/mvnd | awk '{print $1}' | sort -u | grep -c 'lib\(c\|dl\|rt\|pthread\)\.so\.[0-9]')" )) || ( ldd client/target/mvnd && false )
164164
err=0
165-
objdump -T client/target/mvnd | grep GLIBC_ | grep -v 'GLIBC_\([01]\|2\.[0-9]\|2\.1[0-9]\|2\.2[012345678]\)[^0-9]' || err=$?
165+
objdump -T client/target/mvnd | grep GLIBC_ | grep -v 'GLIBC_\([01]\|2\.[0-9]\|2\.2[012345678]\)[^0-9]' || err=$?
166166
(( err == 1 ))
167167
168168
- name: 'Upload daemon test logs'

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
fail-fast: true
3636
matrix:
3737
# binaries wanted: linux amd64, linux arm64, mac intel, mac M1, windows x86
38-
os: [ ubuntu-24.04, ubuntu-22.04-arm, macos-15-intel, macos-15, windows-2025 ]
38+
os: [ ubuntu-24.04, ubuntu-24.04-arm, macos-15-intel, macos-15, windows-2025 ]
3939
runs-on: ${{ matrix.os }}
4040

4141
steps:
@@ -134,7 +134,7 @@ jobs:
134134
run: |
135135
(( 4 == "$(ldd client/target/mvnd | awk '{print $1}' | sort -u | grep -c 'lib\(c\|dl\|rt\|pthread\)\.so\.[0-9]')" )) || ( ldd client/target/mvnd && false )
136136
err=0
137-
objdump -T client/target/mvnd | grep GLIBC_ | grep -v 'GLIBC_\([01]\|2\.[0-9]\|2\.1[0-9]\|2\.2[012345678]\)[^0-9]' || err=$?
137+
objdump -T client/target/mvnd | grep GLIBC_ | grep -v 'GLIBC_\([01]\|2\.[0-9]\|2\.2[012345678]\)[^0-9]' || err=$?
138138
(( err == 1 ))
139139
140140
- name: 'Upload artifact'

client/pom.xml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,11 @@
204204
</profile>
205205

206206
<profile>
207-
<id>linux-image-only-require-glibc-2.12</id>
207+
<id>linux-am64-image-only-require-glibc-2.12</id>
208208
<activation>
209209
<os>
210210
<family>linux</family>
211+
<arch>amd64</arch>
211212
</os>
212213
<file>
213214
<exists>target/graalvm-libs-for-glibc-2.12</exists>
@@ -232,6 +233,36 @@
232233
</plugins>
233234
</build>
234235
</profile>
236+
<profile>
237+
<id>linux-arm64-image-only-require-glibc-2.28</id>
238+
<activation>
239+
<os>
240+
<family>linux</family>
241+
<arch>aarch64</arch>
242+
</os>
243+
<file>
244+
<exists>target/graalvm-libs-for-glibc-2.28</exists>
245+
</file>
246+
</activation>
247+
<properties>
248+
<patchelf.skip>false</patchelf.skip>
249+
</properties>
250+
<build>
251+
<plugins>
252+
<plugin>
253+
<groupId>org.graalvm.buildtools</groupId>
254+
<artifactId>native-maven-plugin</artifactId>
255+
<configuration>
256+
<buildArgs combine.children="append">
257+
<buildArg>-H:CCompilerPath=${basedir}/src/main/resources/glibc/gcc</buildArg>
258+
<buildArg>-H:CCompilerOption=-B${project.build.directory}/graalvm-libs-for-glibc-2.28</buildArg>
259+
<buildArg>-H:CLibraryPath=${project.build.directory}/graalvm-libs-for-glibc-2.28</buildArg>
260+
</buildArgs>
261+
</configuration>
262+
</plugin>
263+
</plugins>
264+
</build>
265+
</profile>
235266

236267
<profile>
237268
<id>native</id>

0 commit comments

Comments
 (0)