fix: use architecture-aware JAVA_HOME on matrix runners

Author: Fabiana Severin

.github/test-matrix.json

@@ -3,12 +3,14 @@
     {
       "runner": "ubuntu-latest",
       "label": "x64",
-      "sam_arch": "x86_64"
+      "sam_arch": "x86_64",
+      "java_suffix": "X64"
     },
     {
       "runner": "ubuntu-24.04-arm",
       "label": "arm64",
-      "sam_arch": "arm64"
+      "sam_arch": "arm64",
+      "java_suffix": "ARM64"
     }
   ]
 }

.github/workflows/build-integration-test.yml

@@ -57,20 +57,20 @@ jobs:
 
       - name: Install core with Maven
         run: |
-          export JAVA_HOME=$JAVA_HOME_8_X64
+          export JAVA_HOME=$JAVA_HOME_8_${{ matrix.arch.java_suffix }}
           mvn -B install --file aws-lambda-java-core/pom.xml
 
       - name: Install log4j2 with Maven
         run: |
-          export JAVA_HOME=$JAVA_HOME_8_X64
+          export JAVA_HOME=$JAVA_HOME_8_${{ matrix.arch.java_suffix }}
           mvn -B install --file aws-lambda-java-log4j2/pom.xml
 
       # build the integration test function
       # this verifies that the function compiles and packages correctly.
       # the tests will run in run-integration-test.yml which deploys to AWS.
       - name: Package integration test function
         run: |
-          export JAVA_HOME=$JAVA_HOME_21_X64
+          export JAVA_HOME=$JAVA_HOME_21_${{ matrix.arch.java_suffix }}
           mvn -B package --file lambda-integration-tests/log4j2-test-function/pom.xml
 
   build:

.github/workflows/run-integration-test.yml

@@ -68,17 +68,17 @@ jobs:
 
       - name: Install core with Maven
         run: |
-          export JAVA_HOME=$JAVA_HOME_8_X64
+          export JAVA_HOME=$JAVA_HOME_8_${{ matrix.arch.java_suffix }}
           mvn -B install --file aws-lambda-java-core/pom.xml
 
       - name: Install log4j2 with Maven
         run: |
-          export JAVA_HOME=$JAVA_HOME_8_X64
+          export JAVA_HOME=$JAVA_HOME_8_${{ matrix.arch.java_suffix }}
           mvn -B install --file aws-lambda-java-log4j2/pom.xml
 
       - name: Build SAM stack
         run: |
-          export JAVA_HOME=$JAVA_HOME_21_X64
+          export JAVA_HOME=$JAVA_HOME_21_${{ matrix.arch.java_suffix }}
           cd lambda-integration-tests && sam build
 
       - name: Validate SAM stack