diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b75c854..e6f44af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,110 +5,110 @@ on: pull_request: workflow_dispatch: schedule: - - cron: '0 1 1 */2 *' + - cron: "0 1 1 */2 *" jobs: build_android: strategy: matrix: - arch: [ "aarch32", "aarch64", "x86", "x86_64" ] + 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 "1_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: 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: 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 "1_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 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 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 + - 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: 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 "9_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/* diff --git a/ci_build_arch_aarch32.sh b/1_ci_build_arch_aarch32.sh similarity index 75% rename from ci_build_arch_aarch32.sh rename to 1_ci_build_arch_aarch32.sh index bf8d323..37de70e 100755 --- a/ci_build_arch_aarch32.sh +++ b/1_ci_build_arch_aarch32.sh @@ -4,5 +4,4 @@ set -e export TARGET=armv7a-linux-androideabi export TARGET_JDK=arm -bash ci_build_global.sh - +bash 2_ci_build_global.sh diff --git a/ci_build_arch_aarch64.sh b/1_ci_build_arch_aarch64.sh similarity index 86% rename from ci_build_arch_aarch64.sh rename to 1_ci_build_arch_aarch64.sh index cd90104..76a1cd7 100755 --- a/ci_build_arch_aarch64.sh +++ b/1_ci_build_arch_aarch64.sh @@ -7,5 +7,5 @@ else fi export TARGET_JDK=aarch64 -bash ci_build_global.sh +bash 2_ci_build_global.sh diff --git a/ci_build_arch_x86.sh b/1_ci_build_arch_x86.sh similarity index 74% rename from ci_build_arch_x86.sh rename to 1_ci_build_arch_x86.sh index 43c9a76..97284a6 100755 --- a/ci_build_arch_x86.sh +++ b/1_ci_build_arch_x86.sh @@ -4,5 +4,5 @@ set -e export TARGET=i686-linux-android export TARGET_JDK=x86 -bash ci_build_global.sh +bash 2_ci_build_global.sh diff --git a/ci_build_arch_x86_64.sh b/1_ci_build_arch_x86_64.sh similarity index 75% rename from ci_build_arch_x86_64.sh rename to 1_ci_build_arch_x86_64.sh index 52c93c4..4f6cbe5 100755 --- a/ci_build_arch_x86_64.sh +++ b/1_ci_build_arch_x86_64.sh @@ -4,5 +4,5 @@ set -e export TARGET=x86_64-linux-android export TARGET_JDK=x86_64 -bash ci_build_global.sh +bash 2_ci_build_global.sh diff --git a/ci_build_global.sh b/2_ci_build_global.sh similarity index 85% rename from ci_build_global.sh rename to 2_ci_build_global.sh index 2cf6bb0..5b1f1ca 100755 --- a/ci_build_global.sh +++ b/2_ci_build_global.sh @@ -21,9 +21,9 @@ fi # Some modifies to NDK to fix -./getlibs.sh -./buildlibs.sh -./clonejdk.sh -./buildjdk.sh -./removejdkdebuginfo.sh -./tarjdk.sh +./3_getlibs.sh +./4_buildlibs.sh +./5_clonejdk.sh +./6_buildjdk.sh +./7_removejdkdebuginfo.sh +./8_tarjdk.sh diff --git a/getlibs.sh b/3_getlibs.sh similarity index 100% rename from getlibs.sh rename to 3_getlibs.sh diff --git a/buildlibs.sh b/4_buildlibs.sh similarity index 100% rename from buildlibs.sh rename to 4_buildlibs.sh diff --git a/clonejdk.sh b/5_clonejdk.sh similarity index 100% rename from clonejdk.sh rename to 5_clonejdk.sh diff --git a/buildjdk.sh b/6_buildjdk.sh similarity index 100% rename from buildjdk.sh rename to 6_buildjdk.sh diff --git a/removejdkdebuginfo.sh b/7_removejdkdebuginfo.sh similarity index 100% rename from removejdkdebuginfo.sh rename to 7_removejdkdebuginfo.sh diff --git a/tarjdk.sh b/8_tarjdk.sh similarity index 100% rename from tarjdk.sh rename to 8_tarjdk.sh diff --git a/repackjre.sh b/9_repackjre.sh similarity index 100% rename from repackjre.sh rename to 9_repackjre.sh