From 4f42af70fee158257fd544a392ce5a20e675d5cc Mon Sep 17 00:00:00 2001
From: Mathias Boulay <spse@mboulay>
Date: Wed, 10 Apr 2024 21:58:02 +0200
Subject: [PATCH] revert yaml

---
 .github/workflows/build.yml | 127 +++++++++++++++++++++++++++---------
 1 file changed, 97 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b73a212..b75c854 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,43 +5,110 @@ on:
   pull_request:
   workflow_dispatch:
   schedule:
-    - cron: "0 1 1 */2 *"
+    - cron: '0 1 1 */2 *'
 
 jobs:
   build_android:
     strategy:
       matrix:
-        arch: ["aarch64"]
+        arch: [ "aarch32", "aarch64", "x86", "x86_64" ]
       fail-fast: false
 
     name: "Build for Android ${{matrix.arch}}"
     runs-on: ubuntu-22.04
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: set up JDK 1.17
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: temurin
-      - name: Install build dependencies
-        run: |
-          sudo apt update
-          sudo apt -y install autoconf python3 python-is-python3 unzip zip systemtap-sdt-dev libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxtst-dev libxt-dev
-      - name: Build with CI build script
-        run: bash "ci_build_arch_${{matrix.arch}}.sh"
-      - name: Upload JDK build output
-        uses: actions/upload-artifact@v4
-        with:
-          name: "jdk17-${{matrix.arch}}"
-          path: jdk17*.tar.xz
-      - name: Upload JRE build output
-        uses: actions/upload-artifact@v4
-        with:
-          name: "jre17-${{matrix.arch}}"
-          path: jre17*.tar.xz
-      - name: Upload JRE debuginfo build output
-        uses: actions/upload-artifact@v4
-        with:
-          name: "jre17-debuginfo-${{matrix.arch}}"
-          path: dizout
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: set up JDK 1.17
+      uses: actions/setup-java@v4
+      with:
+        java-version: 17
+        distribution: temurin
+    - name: Install build dependencies
+      run: |
+        sudo apt update
+        sudo apt -y install autoconf python3 python-is-python3 unzip zip systemtap-sdt-dev libxtst-dev libasound2-dev libelf-dev libfontconfig1-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxtst-dev libxt-dev
+    - name: Build with CI build script
+      run: bash "ci_build_arch_${{matrix.arch}}.sh"
+    - name: Upload JDK build output
+      uses: actions/upload-artifact@v4
+      with:
+        name: "jdk17-${{matrix.arch}}"
+        path: jdk17*.tar.xz
+    - name: Upload JRE build output
+      uses: actions/upload-artifact@v4
+      with:
+        name: 'jre17-${{matrix.arch}}'
+        path: jre17*.tar.xz
+    - name: Upload JRE debuginfo build output
+      uses: actions/upload-artifact@v4
+      with:
+        name: "jre17-debuginfo-${{matrix.arch}}"
+        path: dizout
+
+  build_iosport:
+    name: "Build for iOS aarch64"
+    runs-on: MacStadium
+    continue-on-error: true
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Build with CI build script
+      run: |
+        export PATH=/opt/procursus/bin:/opt/homebrew/bin:$PATH
+        export JAVA_HOME=$(/usr/libexec/java_home -v 17)
+        export BUILD_IOS=1
+        bash "ci_build_arch_aarch64.sh"
+
+#    - name: Upload JDK build output
+#      uses: actions/upload-artifact@v4
+#      with:
+#        name: "jdk17-ios-aarch64"
+#        path: jdk17*.tar.xz
+
+    - name: Upload JRE build output
+      uses: actions/upload-artifact@v4
+      with:
+        name: 'jre17-ios-aarch64'
+        path: jre17*.tar.xz
+
+    - name: Upload JRE debuginfo build output
+      uses: actions/upload-artifact@v4
+      with:
+        name: "jre17-ios-debuginfo-aarch64"
+        path: dizout
+
+  pojav:
+    needs: build_android
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Get jre17-aarch32
+      uses: actions/download-artifact@v4
+      with:
+        name: jre17-aarch32
+        path: pojav
+    - name: Get jre17-aarch64
+      uses: actions/download-artifact@v4
+      with:
+        name: jre17-aarch64
+        path: pojav
+    - name: Get jre17-x86
+      uses: actions/download-artifact@v4
+      with:
+        name: jre17-x86
+        path: pojav
+    - name: Get jre17-x86_64
+      uses: actions/download-artifact@v4
+      with:
+        name: jre17-x86_64
+        path: pojav
+    - name: Repack JRE
+      run: bash "repackjre.sh" $GITHUB_WORKSPACE/pojav $GITHUB_WORKSPACE/pojav/jre17-pojav
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+          name: jre17-pojav
+          path: pojav/jre17-pojav/*