From 14183f662cad8500e2cbed5d5f3c89054675520f Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Thu, 8 May 2025 16:51:16 +0000 Subject: [PATCH 01/16] 8356560: GHA: Add macOS Windows ARM64 testing --- .github/actions/get-msys2/action.yml | 2 +- .github/workflows/main.yml | 11 +++++++++++ make/conf/github-actions.conf | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/actions/get-msys2/action.yml b/.github/actions/get-msys2/action.yml index 4ca5d2ab8471f..1672752f84f25 100644 --- a/.github/actions/get-msys2/action.yml +++ b/.github/actions/get-msys2/action.yml @@ -30,7 +30,7 @@ runs: using: composite steps: - name: 'Install MSYS2' - uses: msys2/setup-msys2@v2.22.0 + uses: msys2/setup-msys2@v2.25.0 with: install: 'autoconf tar unzip zip make' path-type: minimal diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0d8663fab1aa4..e29908dc23795 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -449,3 +449,14 @@ jobs: runs-on: windows-2025 dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }} debug-suffix: -debug + + test-windows-aarch64: + name: windows-aarch64 + needs: + - build-windows-aarch64 + uses: ./.github/workflows/test.yml + with: + platform: windows-aarch64 + bootjdk-platform: windows-aarch64 + runs-on: windows-11-arm + diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf index d2b6cd2312883..d2dbfb038ceca 100644 --- a/make/conf/github-actions.conf +++ b/make/conf/github-actions.conf @@ -47,3 +47,7 @@ MACOS_X64_BOOT_JDK_SHA256=6bbfb1d01741cbe55ab90299cb91464b695de9a3ace85c15131aa2 WINDOWS_X64_BOOT_JDK_EXT=zip WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_windows-x64_bin.zip WINDOWS_X64_BOOT_JDK_SHA256=11d1d9f6ac272d5361c8a0bef01894364081c7fb1a6914c2ad2fc312ae83d63b + +WINDOWS_AARCH64_BOOT_JDK_EXT=zip +WINDOWS_AARCH64_BOOT_JDK_URL=https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B35-ea-beta/OpenJDK24U-jdk_aarch64_windows_hotspot_24_35-ea.zip +WINDOWS_AARCH64_BOOT_JDK_SHA256=bf02f568a28ad8e615e9a05b69a02893a4cffa369dfe2ce916d5a7b75fcf384c From 5f8c1a599330554a3141d28411b3827c1157807a Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Fri, 9 May 2025 12:33:21 -0700 Subject: [PATCH 02/16] Add windows aarch64 build --- .github/workflows/build-windows.yml | 14 +++++++++++--- .github/workflows/main.yml | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index a3091b94cef19..413ed87169464 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -31,6 +31,9 @@ on: platform: required: true type: string + runs-on: + required: true + type: string extra-conf-options: required: false type: string @@ -67,7 +70,7 @@ env: jobs: build-windows: name: build - runs-on: windows-2025 + runs-on: ${{ inputs.runs-on }} defaults: run: shell: bash @@ -92,7 +95,7 @@ jobs: id: bootjdk uses: ./.github/actions/get-bootjdk with: - platform: windows-x64 + platform: ${{ inputs.platform }} - name: 'Get JTReg' id: jtreg @@ -106,7 +109,12 @@ jobs: id: toolchain-check run: | set +e - '/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }} + if [ "${{ inputs.msvc-toolset-architecture }}" = "arm64" ]; then + vcvars="vcvarsarm64.bat" + else + vcvars="vcvars64.bat" + fi + "/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/${vcvars}" -vcvars_ver=${{ inputs.msvc-toolset-version }} if [ $? -eq 0 ]; then echo "Toolchain is already installed" echo "toolchain-installed=true" >> $GITHUB_OUTPUT diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e29908dc23795..8688008796dc1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -366,7 +366,8 @@ jobs: uses: ./.github/workflows/build-windows.yml with: platform: windows-aarch64 - msvc-toolset-version: '14.44' + runs-on: windows-11-arm + msvc-toolset-version: '14.43' msvc-toolset-architecture: 'arm64' make-target: 'hotspot' extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin' From 4b4364466c659cdfd80df6e2537d3a7553a068f0 Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Thu, 19 Jun 2025 09:42:24 -0700 Subject: [PATCH 03/16] Remove cygwin config for aarch64 --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8688008796dc1..4ab2515fc2ce6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -370,7 +370,6 @@ jobs: msvc-toolset-version: '14.43' msvc-toolset-architecture: 'arm64' make-target: 'hotspot' - extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin' configure-arguments: ${{ github.event.inputs.configure-arguments }} make-arguments: ${{ github.event.inputs.make-arguments }} dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }} From da68325f753515d0bab8a12ec85eaa8866780116 Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Thu, 19 Jun 2025 10:41:12 -0700 Subject: [PATCH 04/16] Remove make target --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ab2515fc2ce6..45b5bbf99fb8e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -369,7 +369,6 @@ jobs: runs-on: windows-11-arm msvc-toolset-version: '14.43' msvc-toolset-architecture: 'arm64' - make-target: 'hotspot' configure-arguments: ${{ github.event.inputs.configure-arguments }} make-arguments: ${{ github.event.inputs.make-arguments }} dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }} From e8a805666b16ef8552004d2d1f41334647865618 Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Thu, 19 Jun 2025 23:24:30 -0700 Subject: [PATCH 05/16] Add debug step for windows --- .github/workflows/build-windows.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 413ed87169464..f5c3cb8d93c35 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -97,6 +97,18 @@ jobs: with: platform: ${{ inputs.platform }} + - name: 'Test platform' + id: test-platform + run: | + echo "Processor identifier: ${PROCESSOR_IDENTIFIER}" + echo "Architecture details: $(uname -ar)" + bash make/autoconf/build-aux/config.guess + env: + # We need a minimal PATH on Windows + # Set PATH to "", so just GITHUB_PATH is included + PATH: '' + shell: env /usr/bin/bash --login -eo pipefail {0} + - name: 'Get JTReg' id: jtreg uses: ./.github/actions/get-jtreg From 74c2c3e8e5e9b6749759a55a602f197d8140d8a7 Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Fri, 20 Jun 2025 00:56:00 -0700 Subject: [PATCH 06/16] More debug --- .github/workflows/build-windows.yml | 43 +++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index f5c3cb8d93c35..49ce32ce063f1 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -100,13 +100,21 @@ jobs: - name: 'Test platform' id: test-platform run: | - echo "Processor identifier: ${PROCESSOR_IDENTIFIER}" - echo "Architecture details: $(uname -ar)" - bash make/autoconf/build-aux/config.guess - env: - # We need a minimal PATH on Windows - # Set PATH to "", so just GITHUB_PATH is included - PATH: '' + echo "=== Environment ===" + echo "PROCESSOR_IDENTIFIER: ${PROCESSOR_IDENTIFIER}" + echo "uname -s: $(uname -s)" + echo "uname -m: $(uname -m)" + echo "uname -ar: $(uname -ar)" + echo "" + echo "=== Testing config.guess ===" + cd make/autoconf/build-aux + echo "Direct autoconf-config.guess:" + ./autoconf-config.guess || echo "autoconf-config.guess failed" + echo "" + echo "Custom config.guess:" + bash -x ./config.guess + echo "config.site" + cat /etc/config.site shell: env /usr/bin/bash --login -eo pipefail {0} - name: 'Get JTReg' @@ -145,7 +153,16 @@ jobs: - name: 'Configure' run: > - bash configure + echo "=== Platform Detection During Configure ===" && + echo "Before configure - PROCESSOR_IDENTIFIER: ${PROCESSOR_IDENTIFIER}" && + echo "Before configure - config.guess output:" && + make/autoconf/build-aux/config.guess && + echo "=== Environment Check ===" && + echo "BUILD_PLATFORM: ${BUILD_PLATFORM:-not set}" && + echo "HOST_PLATFORM: ${HOST_PLATFORM:-not set}" && + echo "TARGET_PLATFORM: ${TARGET_PLATFORM:-not set}" && + echo "=== Running Configure ===" && + bash -x configure --with-conf-name=${{ inputs.platform }} ${{ matrix.flags }} --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA} @@ -154,9 +171,11 @@ jobs: --with-gtest=${{ steps.gtest.outputs.path }} --with-msvc-toolset-version=${{ inputs.msvc-toolset-version }} --with-jmod-compress=zip-1 - ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || ( + ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} 2>&1 | tee configure.log || ( echo "Dumping config.log:" && cat config.log && + echo "Dumping configure.log:" && + cat configure.log && exit 1) env: # We need a minimal PATH on Windows @@ -165,6 +184,12 @@ jobs: shell: env /usr/bin/bash --login -eo pipefail {0} if: ${{ inputs.dry-run == false }} + - name: 'Upload configure log' + uses: actions/upload-artifact@v4 + with: + name: configure-log-${{ inputs.platform }}${{ matrix.suffix }} + path: configure.log + - name: 'Build' id: build uses: ./.github/actions/do-build From db0c836a0f72a1de67ffc5017aa64e0560c82c94 Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Fri, 20 Jun 2025 10:43:25 -0700 Subject: [PATCH 07/16] Disable use of config.site file --- .github/workflows/build-windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 49ce32ce063f1..a373d225eb74f 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -181,6 +181,7 @@ jobs: # We need a minimal PATH on Windows # Set PATH to "", so just GITHUB_PATH is included PATH: '' + CONFIG_SITE: '' shell: env /usr/bin/bash --login -eo pipefail {0} if: ${{ inputs.dry-run == false }} From 8395ecd27b8b0a15ecb81e84dca0a44e19d63884 Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Fri, 20 Jun 2025 10:53:22 -0700 Subject: [PATCH 08/16] Remove config.site manually --- .github/workflows/build-windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index a373d225eb74f..2680120f807b0 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -161,6 +161,8 @@ jobs: echo "BUILD_PLATFORM: ${BUILD_PLATFORM:-not set}" && echo "HOST_PLATFORM: ${HOST_PLATFORM:-not set}" && echo "TARGET_PLATFORM: ${TARGET_PLATFORM:-not set}" && + echo "Remove /etc/config.site" && + rm -f /etc/config.site && echo "=== Running Configure ===" && bash -x configure --with-conf-name=${{ inputs.platform }} @@ -181,7 +183,6 @@ jobs: # We need a minimal PATH on Windows # Set PATH to "", so just GITHUB_PATH is included PATH: '' - CONFIG_SITE: '' shell: env /usr/bin/bash --login -eo pipefail {0} if: ${{ inputs.dry-run == false }} From 6d9bef7423c2b009b161e9fb074e2ce75442e946 Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Fri, 20 Jun 2025 11:15:46 -0700 Subject: [PATCH 09/16] Add step to remove default config.site in MSYS2 setup --- .github/actions/get-msys2/action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/actions/get-msys2/action.yml b/.github/actions/get-msys2/action.yml index 1672752f84f25..182202d66d120 100644 --- a/.github/actions/get-msys2/action.yml +++ b/.github/actions/get-msys2/action.yml @@ -42,3 +42,9 @@ runs: # Prepend msys2/msys64/usr/bin to the PATH echo "$env:RUNNER_TOOL_CACHE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH shell: pwsh + + - name: 'Remove default config.site' + run: | + echo "Removing default config.site" + rm -f /etc/config.site + shell: env /usr/bin/bash --login -eo pipefail {0} From 4f4d7472c3e0701e99d382e5f72889e73c5ad8b2 Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Fri, 20 Jun 2025 11:15:56 -0700 Subject: [PATCH 10/16] Clean debug changes --- .github/workflows/build-windows.yml | 61 ++++++++++------------------- 1 file changed, 21 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 2680120f807b0..b41720a805c6b 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -97,25 +97,25 @@ jobs: with: platform: ${{ inputs.platform }} - - name: 'Test platform' - id: test-platform - run: | - echo "=== Environment ===" - echo "PROCESSOR_IDENTIFIER: ${PROCESSOR_IDENTIFIER}" - echo "uname -s: $(uname -s)" - echo "uname -m: $(uname -m)" - echo "uname -ar: $(uname -ar)" - echo "" - echo "=== Testing config.guess ===" - cd make/autoconf/build-aux - echo "Direct autoconf-config.guess:" - ./autoconf-config.guess || echo "autoconf-config.guess failed" - echo "" - echo "Custom config.guess:" - bash -x ./config.guess - echo "config.site" - cat /etc/config.site - shell: env /usr/bin/bash --login -eo pipefail {0} + # - name: 'Test platform' + # id: test-platform + # run: | + # echo "=== Environment ===" + # echo "PROCESSOR_IDENTIFIER: ${PROCESSOR_IDENTIFIER}" + # echo "uname -s: $(uname -s)" + # echo "uname -m: $(uname -m)" + # echo "uname -ar: $(uname -ar)" + # echo "" + # echo "=== Testing config.guess ===" + # cd make/autoconf/build-aux + # echo "Direct autoconf-config.guess:" + # ./autoconf-config.guess || echo "autoconf-config.guess failed" + # echo "" + # echo "Custom config.guess:" + # bash -x ./config.guess + # echo "config.site" + # cat /etc/config.site + # shell: env /usr/bin/bash --login -eo pipefail {0} - name: 'Get JTReg' id: jtreg @@ -153,18 +153,7 @@ jobs: - name: 'Configure' run: > - echo "=== Platform Detection During Configure ===" && - echo "Before configure - PROCESSOR_IDENTIFIER: ${PROCESSOR_IDENTIFIER}" && - echo "Before configure - config.guess output:" && - make/autoconf/build-aux/config.guess && - echo "=== Environment Check ===" && - echo "BUILD_PLATFORM: ${BUILD_PLATFORM:-not set}" && - echo "HOST_PLATFORM: ${HOST_PLATFORM:-not set}" && - echo "TARGET_PLATFORM: ${TARGET_PLATFORM:-not set}" && - echo "Remove /etc/config.site" && - rm -f /etc/config.site && - echo "=== Running Configure ===" && - bash -x configure + bash configure --with-conf-name=${{ inputs.platform }} ${{ matrix.flags }} --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA} @@ -173,11 +162,9 @@ jobs: --with-gtest=${{ steps.gtest.outputs.path }} --with-msvc-toolset-version=${{ inputs.msvc-toolset-version }} --with-jmod-compress=zip-1 - ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} 2>&1 | tee configure.log || ( + ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || ( echo "Dumping config.log:" && cat config.log && - echo "Dumping configure.log:" && - cat configure.log && exit 1) env: # We need a minimal PATH on Windows @@ -186,12 +173,6 @@ jobs: shell: env /usr/bin/bash --login -eo pipefail {0} if: ${{ inputs.dry-run == false }} - - name: 'Upload configure log' - uses: actions/upload-artifact@v4 - with: - name: configure-log-${{ inputs.platform }}${{ matrix.suffix }} - path: configure.log - - name: 'Build' id: build uses: ./.github/actions/do-build From 9cfffe535cd749ff47772e2fffedbcdb332629cc Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Fri, 20 Jun 2025 13:55:30 -0700 Subject: [PATCH 11/16] Add debug suffix for Windows ARM tests --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 45b5bbf99fb8e..710394c198abc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -458,4 +458,5 @@ jobs: platform: windows-aarch64 bootjdk-platform: windows-aarch64 runs-on: windows-11-arm + debug-suffix: -debug From 5e9339f09942c0da6734375d67487b2491a032ce Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Fri, 20 Jun 2025 13:56:12 -0700 Subject: [PATCH 12/16] Bump MSVC to 14.44 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 710394c198abc..b143a594dc0e3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -367,7 +367,7 @@ jobs: with: platform: windows-aarch64 runs-on: windows-11-arm - msvc-toolset-version: '14.43' + msvc-toolset-version: '14.44' msvc-toolset-architecture: 'arm64' configure-arguments: ${{ github.event.inputs.configure-arguments }} make-arguments: ${{ github.event.inputs.make-arguments }} From 91f5fc41d1cbdfda40f3a09c8206654ffeeac180 Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Fri, 20 Jun 2025 15:10:24 -0700 Subject: [PATCH 13/16] Move back to 14.43 and make arm64 uppercase --- .github/workflows/build-windows.yml | 2 +- .github/workflows/main.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index b41720a805c6b..669a7f35e9b2f 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -129,7 +129,7 @@ jobs: id: toolchain-check run: | set +e - if [ "${{ inputs.msvc-toolset-architecture }}" = "arm64" ]; then + if [ "${{ inputs.msvc-toolset-architecture }}" = "ARM64" ]; then vcvars="vcvarsarm64.bat" else vcvars="vcvars64.bat" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b143a594dc0e3..b6e5e255bcc8e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -367,8 +367,8 @@ jobs: with: platform: windows-aarch64 runs-on: windows-11-arm - msvc-toolset-version: '14.44' - msvc-toolset-architecture: 'arm64' + msvc-toolset-version: '14.43' + msvc-toolset-architecture: 'ARM64' configure-arguments: ${{ github.event.inputs.configure-arguments }} make-arguments: ${{ github.event.inputs.make-arguments }} dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }} From 137c755f6e095f046cdbeb49c0637975b8e0d708 Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Fri, 20 Jun 2025 15:10:52 -0700 Subject: [PATCH 14/16] Clean and add comments --- .github/actions/get-msys2/action.yml | 1 + .github/workflows/build-windows.yml | 20 -------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/actions/get-msys2/action.yml b/.github/actions/get-msys2/action.yml index 182202d66d120..bdbb96575d6a5 100644 --- a/.github/actions/get-msys2/action.yml +++ b/.github/actions/get-msys2/action.yml @@ -43,6 +43,7 @@ runs: echo "$env:RUNNER_TOOL_CACHE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH shell: pwsh + # Remove the default config.site file provided by MSYS2 to ensure config.guess accurately detects the host system. - name: 'Remove default config.site' run: | echo "Removing default config.site" diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 669a7f35e9b2f..9b279a974d3bf 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -97,26 +97,6 @@ jobs: with: platform: ${{ inputs.platform }} - # - name: 'Test platform' - # id: test-platform - # run: | - # echo "=== Environment ===" - # echo "PROCESSOR_IDENTIFIER: ${PROCESSOR_IDENTIFIER}" - # echo "uname -s: $(uname -s)" - # echo "uname -m: $(uname -m)" - # echo "uname -ar: $(uname -ar)" - # echo "" - # echo "=== Testing config.guess ===" - # cd make/autoconf/build-aux - # echo "Direct autoconf-config.guess:" - # ./autoconf-config.guess || echo "autoconf-config.guess failed" - # echo "" - # echo "Custom config.guess:" - # bash -x ./config.guess - # echo "config.site" - # cat /etc/config.site - # shell: env /usr/bin/bash --login -eo pipefail {0} - - name: 'Get JTReg' id: jtreg uses: ./.github/actions/get-jtreg From 892d3bb3f84d971d031c70ede5fd3224f1cdc35e Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Tue, 8 Jul 2025 13:46:05 -0700 Subject: [PATCH 15/16] Add dry-run to windows-aarch64 --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b6e5e255bcc8e..89f801beb2622 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -452,11 +452,13 @@ jobs: test-windows-aarch64: name: windows-aarch64 needs: + - prepare - build-windows-aarch64 uses: ./.github/workflows/test.yml with: platform: windows-aarch64 bootjdk-platform: windows-aarch64 runs-on: windows-11-arm + dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }} debug-suffix: -debug From add245dfd7772c2411fea11cf538103e29c3166d Mon Sep 17 00:00:00 2001 From: Luigi Montoya Date: Tue, 8 Jul 2025 13:47:08 -0700 Subject: [PATCH 16/16] Fix runs-on in windows x64 --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89f801beb2622..9e0e53d10ef68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -353,6 +353,7 @@ jobs: uses: ./.github/workflows/build-windows.yml with: platform: windows-x64 + runs-on: windows-2025 msvc-toolset-version: '14.44' msvc-toolset-architecture: 'x86.x64' configure-arguments: ${{ github.event.inputs.configure-arguments }}