From cdc62d406479e3d55e98c9b5890bbcb7e5c06891 Mon Sep 17 00:00:00 2001 From: Premiermoney Date: Thu, 21 May 2026 09:32:46 -0400 Subject: [PATCH] Update build-macos.yml --- .github/workflows/build-macos.yml | 49 ++++++++----------------------- 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 435576f4afd78..5ccff78946062 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -1,27 +1,4 @@ -# -# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# + name: 'Build (macos)' @@ -29,10 +6,10 @@ on: workflow_call: inputs: platform: - required: true + required: false type: string runs-on: - required: true + required: false type: string extra-conf-options: required: false @@ -46,7 +23,7 @@ on: type: string default: '[ "debug", "release" ]' xcode-toolset-version: - required: true + required: false type: string configure-arguments: required: false @@ -69,29 +46,29 @@ jobs: matrix: debug-level: ${{ fromJSON(inputs.debug-levels) }} include: - - debug-level: debug + debug-level: debug flags: --with-debug-level=fastdebug suffix: -debug steps: - - name: 'Checkout the JDK source' + name: 'Checkout the JDK source' uses: actions/checkout@v6 - - name: 'Get the BootJDK' + name: 'Get the BootJDK' id: bootjdk uses: ./.github/actions/get-bootjdk with: platform: ${{ inputs.platform }} - - name: 'Get JTReg' + name: 'Get JTReg' id: jtreg uses: ./.github/actions/get-jtreg - - name: 'Get GTest' + name: 'Get GTest' id: gtest uses: ./.github/actions/get-gtest - - name: 'Install toolchain and dependencies' + name: 'Install toolchain and dependencies' run: | # Run Homebrew installation and xcode-select brew install autoconf make @@ -99,7 +76,7 @@ jobs: # This will make GNU make available as 'make' and not only as 'gmake' echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH - - name: 'Configure' + name: 'Configure' run: > bash configure --with-conf-name=${{ inputs.platform }} @@ -117,7 +94,7 @@ jobs: cat config.log && exit 1) - - name: 'Build' + name: 'Build' id: build uses: ./.github/actions/do-build with: @@ -126,7 +103,7 @@ jobs: debug-suffix: '${{ matrix.suffix }}' if: ${{ inputs.dry-run == false }} - - name: 'Upload bundles' + name: 'Upload bundles' uses: ./.github/actions/upload-bundles with: platform: ${{ inputs.platform }}