From b7ec44cb0932f12c2fcd87b33d877213a1393213 Mon Sep 17 00:00:00 2001 From: Eva Isabella Luna Date: Mon, 19 May 2025 17:31:45 -0600 Subject: [PATCH] [Actions] Switch to J316sAP The security setup on J316sAP doesn't allow for the actions user to install from Homebrew. --- .github/workflows/build.yml | 4 ++-- 6_buildjdk.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3104ff9..521ab39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,7 +60,7 @@ jobs: fail-fast: false name: "Build Java ${{ matrix.version }} for iOS aarch64" - runs-on: MacStadium + runs-on: J316sAP continue-on-error: true steps: - name: Checkout repository @@ -70,7 +70,7 @@ jobs: run: | export PATH=/opt/procursus/bin:/opt/homebrew/bin:$PATH export JAVA_HOME=$(/usr/libexec/java_home -v ${{ matrix.version }}) - export BUILD_IOS=1 + export BUILD_IOS=1 J316SAP=1 export TARGET_VERSION=${{ matrix.version }} bash "1_ci_build_arch_aarch64.sh" diff --git a/6_buildjdk.sh b/6_buildjdk.sh index 7bb2c4c..30f04b1 100755 --- a/6_buildjdk.sh +++ b/6_buildjdk.sh @@ -77,7 +77,9 @@ else export LDFLAGS+="-arch arm64" export BUILD_SYSROOT_CFLAGS="-isysroot ${themacsysroot}" - HOMEBREW_NO_AUTO_UPDATE=1 brew install fontconfig ldid xquartz autoconf + if [[ "$J316SAP" != "1" ]]; then + HOMEBREW_NO_AUTO_UPDATE=1 brew install fontconfig ldid xquartz autoconf + fi fi # fix building libjawt