diff --git a/.github/workflows/release-runtime-interface-client.yml b/.github/workflows/release-runtime-interface-client.yml index eb48b752..49c3f8d5 100644 --- a/.github/workflows/release-runtime-interface-client.yml +++ b/.github/workflows/release-runtime-interface-client.yml @@ -55,10 +55,10 @@ jobs: include: - arch: x86_64 runner: codebuild-aws-lambda-java-libs-test-trigger-x86-${{ github.run_id }}-${{ github.run_attempt }} - profiles: linux-x86_64 + profiles: linux-x86_64 linux_musl-x86_64 - arch: aarch64 runner: codebuild-aws-lambda-java-libs-test-trigger-arm64-${{ github.run_id }}-${{ github.run_attempt }} - profiles: linux-aarch64 + profiles: linux-aarch64 linux_musl-aarch64 runs-on: ${{ matrix.runner }} timeout-minutes: 45 steps: @@ -243,7 +243,7 @@ jobs: - name: Run tests env: IS_JAVA_8: true - run: mvn test --file "$MODULE/pom.xml" + run: mvn test -DargLineForReflectionTestOnly="" --file "$MODULE/pom.xml" # JARs to attach + .so files for the fat main JAR. - name: Download native artifacts diff --git a/aws-lambda-java-runtime-interface-client/pom.xml b/aws-lambda-java-runtime-interface-client/pom.xml index c76f3761..6db41aa3 100644 --- a/aws-lambda-java-runtime-interface-client/pom.xml +++ b/aws-lambda-java-runtime-interface-client/pom.xml @@ -442,9 +442,16 @@ jar linux-aarch_64 - + + ${project.build.directory}/${project.build.finalName}-linux_musl-x86_64.jar + jar + linux_musl-x86_64 + + + ${project.build.directory}/${project.build.finalName}-linux_musl-aarch_64.jar + jar + linux_musl-aarch_64 + diff --git a/aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh b/aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh index 82e49d56..44a290b6 100755 --- a/aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh +++ b/aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh @@ -116,9 +116,7 @@ if [ -n "$BUILD_OS" ] && [ -n "$BUILD_ARCH" ]; then else # build for all architectures and libc implementations declare -a ARCHITECTURES=("x86_64" "aarch_64") - # musl (Alpine) temporarily disabled for testing: the egress-locked release - # runner can't reach the Alpine apk mirrors. Re-add "musl" once that's solved. - declare -a LIBC_IMPLS=("glibc") + declare -a LIBC_IMPLS=("glibc" "musl") for arch in "${ARCHITECTURES[@]}"; do