Merge pull request #1 from brcrista/main

Fix CI

.github/workflows/e2e-versions.yml

@@ -178,25 +178,29 @@ jobs:
         shell: bash
 
   setup-java-custom-architecture:
-    # Only Zulu provides x86 arch for now and only for windows / ubuntu
-    # Only Microsoft provides arm64 for windows / ubuntu / os x
-    if: ${{ (matrix.distribution == 'zulu' && matrix.architecture == 'x86' && matrix.os != 'macos-latest' ) || (matrix.distribution == 'microsoft' && matrix.architecture == 'arm64') }}
     name: ${{ matrix.distribution }} ${{ matrix.version }} (jdk-${{ matrix.architecture }}) - ${{ matrix.os }}
     needs: setup-java-major-minor-versions
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
-        # Only Zulu and Liberica provides x86 arch for now and only for windows / ubuntu
         os: [windows-latest, ubuntu-latest]
-        distribution: ['zulu', 'liberica']
-=======
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution: ['zulu', 'microsoft']
->>>>>>> Add microsoft distribution of the JDK.
+        distribution: ['liberica', 'microsoft', 'zulu']
         version: ['11']
-        architecture: [ 'x86', 'arm64' ]
+        architecture: [ 'x86', 'aarch64' ]
+        exclude:
+          # Only Liberica and Zulu provide x86 arch and only for Windows and Ubuntu
+          - distribution: 'liberica'
+            os: macos-latest
+          - distribution: 'zulu'
+            os: macos-latest
+          - distribution: 'microsoft'
+            architecture: 'x86'
+          # Only Microsoft provides aarch64
+          - distribution: 'liberica'
+            architecture: 'aarch64'
+          - distribution: 'zulu'
+            architecture: 'aarch64'
     steps:
       - name: Checkout
         uses: actions/checkout@v2