Skip to content

Commit 6daba52

Browse files
committed
Align release.yaml too
1 parent 77f9549 commit 6daba52

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

.github/workflows/release.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
run: ./mvnw clean -Dmrm=false -B -ntp -e
7676

7777
- name: 'Patch AMD64 GraalVM libs for only requiring glibc 2.12'
78-
if: runner.os == 'linux' && runner.arch == 'X64'
78+
if: ${{ env.OS == 'linux' && env.ARCH == 'amd64' }}
7979
shell: bash
8080
run: |
8181
mkdir -p client/target/graalvm-libs-for-glibc-2.12
@@ -96,7 +96,7 @@ jobs:
9696
objcopy --redefine-syms=client/src/main/resources/glibc/glibc.redef client/target/graalvm-libs-for-glibc-2.12/Scrt1.o 2>/dev/null
9797
9898
- name: 'Patch ARM64 GraalVM libs for only requiring glibc 2.28'
99-
if: runner.os == 'linux' && runner.arch == 'ARM64'
99+
if: ${{ env.OS == 'linux' && env.ARCH == 'aarch64' }}
100100
shell: bash
101101
run: |
102102
mkdir -p client/target/graalvm-libs-for-glibc-2.28
@@ -115,18 +115,28 @@ jobs:
115115
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
116116
ld -r /lib/aarch64-linux-gnu/Scrt1.o client/target/dynamic-libc-start.o -o client/target/graalvm-libs-for-glibc-2.28/Scrt1.o
117117
objcopy --redefine-syms=client/src/main/resources/glibc/glibc.redef client/target/graalvm-libs-for-glibc-2.28/Scrt1.o 2>/dev/null
118+
118119
- name: 'Build native distribution'
119120
run: ./mvnw verify -Pnative -Dmrm=false -B -ntp -e -DskipTests -s .mvn/release-settings.xml
120121

121-
- name: 'Verify native binary for only requiring glibc 2.28'
122-
if: ${{ env.OS == 'linux' }}
122+
- name: 'Verify AMD64 native binary for only requiring glibc 2.12'
123+
if: ${{ env.OS == 'linux' && env.ARCH == 'amd64' }}
123124
shell: bash
124125
run: |
125126
(( 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 )
126127
err=0
127128
objdump -T client/target/mvnd | grep GLIBC_ | grep -v 'GLIBC_\([01]\|2\.[0-9]\|2\.1[012]\)[^0-9]' || err=$?
128129
(( err == 1 ))
129130
131+
- name: 'Verify ARM64 native binary for only requiring glibc 2.28'
132+
if: ${{ env.OS == 'linux' && env.ARCH == 'aarch64' }}
133+
shell: bash
134+
run: |
135+
(( 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 )
136+
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=$?
138+
(( err == 1 ))
139+
130140
- name: 'Upload artifact'
131141
uses: actions/upload-artifact@v6
132142
with:

0 commit comments

Comments
 (0)