s/x64/aarch64

abhinayagarwal · Feb 16, 2024 · 5118417 · 5118417
1 parent 841b657
commit 5118417
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/.github/actions/do-build/action.yml b/.github/actions/do-build/action.yml
@@ -42,18 +42,18 @@ runs:
     - name: 'Build Android'
       id: build-android-linux
       run: |
-        cd build/android-linux-x64
+        cd build/android-linux-aarch64
         make LOG=cmdlines static-libs-image
       shell: bash
-      if: inputs.platform == 'android-linux-x64'
+      if: inputs.platform == 'android-linux-aarch64'
 
     - name: 'Build'
       id: build
       run: >
         make LOG=info ${{ inputs.make-target }}
         || bash ./.github/scripts/gen-build-failure-report.sh "$GITHUB_STEP_SUMMARY"
       shell: bash
-      if: inputs.platform != 'android-linux-x64'
+      if: inputs.platform != 'android-linux-aarch64'
 
     - name: 'Check for failure'
       id: check

diff --git a/.github/actions/upload-bundles/action.yml b/.github/actions/upload-bundles/action.yml
@@ -42,7 +42,10 @@ runs:
       run: |
         # Rename bundles to consistent names
         ls build
-        ls build/android-linux-x64
+        echo "<<<"
+        ls build/android-linux-aarch64
+        echo ">>>"
+        ls build/android-linux-aarch64/images/static-libs/
         jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
         jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
         symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
@@ -79,3 +82,11 @@ runs:
         path: bundles
         retention-days: 1
       if: steps.bundles.outputs.bundles-found == 'true'
+
+    - name: 'Upload static image artifact'
+      uses: actions/upload-artifact@v4
+      with:
+        name: android-linux-aarch64
+        path: build/android-linux-aarch64/images/static-libs/
+        retention-days: 1
+      if: inputs.platform == 'android-linux-x64'
diff --git a/.github/workflows/build-android-linux.yml b/.github/workflows/build-android-linux.yml
@@ -117,7 +117,7 @@ jobs:
       - name: 'Configure'
         run: >
           bash configure
-          --with-conf-name=android-linux-x64
+          --with-conf-name=android-linux-aarch64
           --enable-headless-only
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
           --with-toolchain-path=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin
@@ -138,11 +138,11 @@ jobs:
         uses: ./.github/actions/do-build
         with:
           make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
-          platform: android-linux-x64
+          platform: android-linux-aarch64
           debug-suffix: '${{ matrix.suffix }}'
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
         with:
-          platform: android-linux-x64
+          platform: android-linux-aarch64
           debug-suffix: '${{ matrix.suffix }}'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -34,9 +34,9 @@ on:
   workflow_dispatch:
     inputs:
       platforms:
-        description: 'Platform(s) to execute on (comma separated, e.g. "android-linux-x64, linux-x64, macos, aarch64")'
+        description: 'Platform(s) to execute on (comma separated, e.g. "android-linux-aarch64, linux-x64, macos, aarch64")'
         required: true
-        default: 'android-linux-x64, linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
+        default: 'android-linux-aarch64, linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
       configure-arguments:
         description: 'Additional configure arguments'
         required: false
@@ -58,7 +58,7 @@ jobs:
     name: 'Select platforms'
     runs-on: ubuntu-22.04
     outputs:
-      android-linux-x64: ${{ steps.include.outputs.android-linux-x64 }}
+      android-linux-aarch64: ${{ steps.include.outputs.android-linux-aarch64 }}
       linux-x64: ${{ steps.include.outputs.linux-x64 }}
       linux-x86: ${{ steps.include.outputs.linux-x86 }}
       linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
@@ -111,7 +111,7 @@ jobs:
             echo 'false'
           }
 
-          echo "android-linux-x64=$(check_platform android-linux-x64 android linux x64)" >> $GITHUB_OUTPUT
+          echo "android-linux-aarch64=$(check_platform android-linux-aarch64 android linux aarch64)" >> $GITHUB_OUTPUT
           echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
           echo "linux-x86=$(check_platform linux-x86 linux x86)" >> $GITHUB_OUTPUT
           echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
@@ -126,8 +126,8 @@ jobs:
   ### Build jobs
   ###
 
-  build-android-linux-x64:
-    name: android-linux-x64
+  build-android-linux-aarch64:
+    name: android-linux-aarch64
     needs: select
     uses: ./.github/workflows/build-android-linux.yml
     with:
@@ -136,7 +136,7 @@ jobs:
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
     # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
-    if: needs.select.outputs.android-linux-x64 == 'true'
+    if: needs.select.outputs.android-linux-aarch64 == 'true'
 
   build-linux-x64:
     name: linux-x64
@@ -362,7 +362,7 @@ jobs:
     runs-on: ubuntu-22.04
     if: always()
     needs:
-      - build-android-linux-x64
+      - build-android-linux-aarch64
       - build-linux-x64
       - build-linux-x86
       - build-linux-x64-hs-nopch
@@ -403,4 +403,4 @@ jobs:
                 -X DELETE "$url" \
             || echo "Failed to remove bundle"
           done
-        if: needs.select.outputs.android-linux-x64 == 'false'
+        if: needs.select.outputs.android-linux-aarch64 == 'false'