mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 22:46:14 -05:00
feat: select NSH by default for macOS artifacts
This commit is contained in:
2 files changed
+4
-4
No files matched your search
@@ -29,7 +29,7 @@ on:
|
|||||||
macos_gui:
|
macos_gui:
|
||||||
description: 'macOS shell to build; NSH also runs its separate macOS/Linux checks'
|
description: 'macOS shell to build; NSH also runs its separate macOS/Linux checks'
|
||||||
required: true
|
required: true
|
||||||
default: tauri
|
default: nsh
|
||||||
type: choice
|
type: choice
|
||||||
options: [tauri, nsh]
|
options: [tauri, nsh]
|
||||||
build_bsd:
|
build_bsd:
|
||||||
@@ -198,7 +198,7 @@ jobs:
|
|||||||
|
|
||||||
check-nsh:
|
check-nsh:
|
||||||
needs: validate-inputs
|
needs: validate-inputs
|
||||||
if: ${{ github.event_name == 'workflow_dispatch' && inputs.build_macos && inputs.macos_gui == 'nsh' }}
|
if: ${{ (github.event_name == 'workflow_dispatch' && inputs.build_macos && inputs.macos_gui == 'nsh') || (startsWith(github.ref, 'refs/tags/') && vars.BUILD_MACOS_ON_TAG == 'true') }}
|
||||||
uses: ./.github/workflows/check-nsh.yaml
|
uses: ./.github/workflows/check-nsh.yaml
|
||||||
with:
|
with:
|
||||||
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
||||||
@@ -586,7 +586,7 @@ jobs:
|
|||||||
environment: macos-release
|
environment: macos-release
|
||||||
timeout-minutes: 120
|
timeout-minutes: 120
|
||||||
env:
|
env:
|
||||||
MACOS_GUI: ${{ github.event_name == 'workflow_dispatch' && inputs.macos_gui || 'tauri' }}
|
MACOS_GUI: ${{ github.event_name == 'workflow_dispatch' && inputs.macos_gui || 'nsh' }}
|
||||||
steps:
|
steps:
|
||||||
- name: Verify runner architecture
|
- name: Verify runner architecture
|
||||||
run: test "$(uname -m)" = arm64
|
run: test "$(uname -m)" = arm64
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ on:
|
|||||||
expected_gui:
|
expected_gui:
|
||||||
description: 'Expected macOS shell in the selected build artifact'
|
description: 'Expected macOS shell in the selected build artifact'
|
||||||
required: true
|
required: true
|
||||||
default: tauri
|
default: nsh
|
||||||
type: choice
|
type: choice
|
||||||
options: [tauri, nsh]
|
options: [tauri, nsh]
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user