From cfe31c7cd9ac6926091e7beccffb6bd03c01fa35 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Wed, 31 Jan 2024 14:35:14 +0000 Subject: [PATCH 1/2] Add ARM64 MacOS runner Signed-off-by: Andrew W. Harn --- .github/workflows/zowe-cli-plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zowe-cli-plugin.yml b/.github/workflows/zowe-cli-plugin.yml index a60d17d..176ee94 100644 --- a/.github/workflows/zowe-cli-plugin.yml +++ b/.github/workflows/zowe-cli-plugin.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: node-version: [18.x, 20.x] - os: [windows-latest, ubuntu-latest, macos-latest] + os: [windows-latest, ubuntu-latest, macos-latest, macos-14] env: OS: ${{ matrix.os }} From b69321f19eb654c16955fc843f8c3b659e2f0453 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Wed, 31 Jan 2024 16:59:03 +0000 Subject: [PATCH 2/2] Add ability to choose MacOS version Signed-off-by: Andrew W. Harn --- .github/workflows/zowe-cli-plugin.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/zowe-cli-plugin.yml b/.github/workflows/zowe-cli-plugin.yml index 176ee94..48dbcbc 100644 --- a/.github/workflows/zowe-cli-plugin.yml +++ b/.github/workflows/zowe-cli-plugin.yml @@ -1,6 +1,17 @@ name: zowe-cli-plugin -on: [push, pull_request, workflow_dispatch] +on: + push: + pull_request: + workflow_dispatch: + inputs: + macos-type: + type: choice + description: Run against x86-based MacOS (12), otherwise run against ARM64-based MacOS (14) + default: macos-14 + options: + - macos-12 + - macos-14 jobs: test: @@ -13,7 +24,10 @@ jobs: fail-fast: false matrix: node-version: [18.x, 20.x] - os: [windows-latest, ubuntu-latest, macos-latest, macos-14] + os: + - windows-latest + - ubuntu-latest + - ${{ github.event.inputs.macos-type || 'macos-14'}} env: OS: ${{ matrix.os }}