ci: verify and select the NSH macOS shell explicitly

This commit is contained in:
Kevin Yue committed 2026-11-01 23:35:54 +08:00
1 parent ce5a19c131
commit 4aa7b66313
3 files changed
+171 -4

No files matched your search

+28 -3
View File
@@ -26,6 +26,12 @@ on:
required: true
default: false
type: boolean
macos_gui:
description: 'macOS shell to build; NSH also runs its separate macOS/Linux checks'
required: true
default: tauri
type: choice
options: [tauri, nsh]
build_bsd:
description: 'Build FreeBSD/OpenBSD packages for this run'
required: true
@@ -190,6 +196,16 @@ jobs:
timeout-minutes: 80
run: bash .ci/scripts/test-private-desktop.sh "$PWD/source"
check-nsh:
needs: validate-inputs
if: ${{ github.event_name == 'workflow_dispatch' && inputs.build_macos && inputs.macos_gui == 'nsh' }}
uses: ./.github/workflows/check-nsh.yaml
with:
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
secrets:
GH_PAT: ${{ secrets.GH_PAT }}
tarball:
needs: validate-inputs
runs-on: ubuntu-latest
@@ -553,8 +569,14 @@ jobs:
build-macos:
name: build-macos
needs: [validate-inputs, test-gp, test-gpgui]
if: ${{ (github.event_name == 'workflow_dispatch' && inputs.build_macos) || (startsWith(github.ref, 'refs/tags/') && vars.BUILD_MACOS_ON_TAG == 'true') }}
needs: [validate-inputs, test-gp, test-gpgui, check-nsh]
if: >-
${{ !cancelled() &&
needs.validate-inputs.result == 'success' &&
needs.test-gp.result == 'success' && needs.test-gpgui.result == 'success' &&
(needs.check-nsh.result == 'success' || needs.check-nsh.result == 'skipped') &&
((github.event_name == 'workflow_dispatch' && inputs.build_macos) ||
(startsWith(github.ref, 'refs/tags/') && vars.BUILD_MACOS_ON_TAG == 'true')) }}
permissions:
contents: read
concurrency:
@@ -564,7 +586,7 @@ jobs:
environment: macos-release
timeout-minutes: 120
env:
MACOS_GUI: tauri
MACOS_GUI: ${{ github.event_name == 'workflow_dispatch' && inputs.macos_gui || 'tauri' }}
steps:
- name: Verify runner architecture
run: test "$(uname -m)" = arm64
@@ -672,6 +694,9 @@ jobs:
ninja \
pkgconf \
python
if [[ "$MACOS_GUI" == nsh ]]; then
rustup toolchain install 1.97.0 --profile minimal
fi
- name: Import signing identity
env:
+135
View File
@@ -0,0 +1,135 @@
name: Check NSH
on:
workflow_dispatch:
inputs:
gp_ref:
description: 'Full GlobalProtect-openconnect commit SHA'
required: true
type: string
gpgui_ref:
description: 'Full gpgui commit SHA'
required: true
type: string
workflow_call:
inputs:
gp_ref:
required: true
type: string
gpgui_ref:
required: true
type: string
secrets:
GH_PAT:
required: true
permissions:
contents: read
jobs:
check:
name: NSH (${{ matrix.platform }})
runs-on: ${{ matrix.runner }}
timeout-minutes: 90
strategy:
fail-fast: false
matrix:
include:
- platform: linux
runner: ubuntu-24.04
- platform: macos
runner: ${{ vars.MACOS_RUNNER || 'macos-15' }}
env:
CARGO_INCREMENTAL: '0'
CARGO_BUILD_JOBS: '2'
steps:
- name: Require immutable source refs
env:
GP_REF: ${{ inputs.gp_ref }}
GPGUI_REF: ${{ inputs.gpgui_ref }}
run: |
[[ "$GP_REF" =~ ^[0-9a-f]{40}$ && "$GPGUI_REF" =~ ^[0-9a-f]{40}$ ]] || {
echo "Both source refs must be full commit SHAs."
exit 1
}
- name: Checkout GlobalProtect-openconnect
uses: actions/checkout@v6
with:
ref: ${{ inputs.gp_ref }}
path: source/gp
submodules: recursive
persist-credentials: false
- name: Checkout CI helpers
uses: actions/checkout@v6
with:
path: .ci
persist-credentials: false
- name: Checkout gpgui
uses: ./.ci/.github/actions/checkout-private
with:
token: ${{ secrets.GH_PAT }}
ref: ${{ inputs.gpgui_ref }}
path: source/gpgui
- name: Install Linux dependencies
if: matrix.platform == 'linux'
run: |
sudo apt-get update
sudo apt-get install -y autoconf automake gettext libtool pkg-config \
clang libclang-dev libgtk-4-dev libicu-dev libxml2-dev libssl-dev \
libgnutls28-dev liblz4-dev libwayland-dev libxkbcommon-dev
- name: Install macOS dependencies
if: matrix.platform == 'macos'
env:
DEVELOPER_DIR: /Applications/Xcode_26.3.app/Contents/Developer
run: |
xcodebuild -version
echo "DEVELOPER_DIR=$DEVELOPER_DIR" >> "$GITHUB_ENV"
brew install autoconf automake gettext libtool pkgconf gnutls libxml2 lz4 openssl@3
echo "$(brew --prefix gettext)/bin" >> "$GITHUB_PATH"
echo "ACLOCAL_PATH=$(brew --prefix gettext)/share/aclocal" >> "$GITHUB_ENV"
echo "PKG_CONFIG_PATH=$(brew --prefix libxml2)/lib/pkgconfig:$(brew --prefix gnutls)/lib/pkgconfig" >> "$GITHUB_ENV"
- name: Install the NSH compiler
run: rustup toolchain install 1.97.0 --profile minimal
- name: Cache public crate downloads
uses: actions/cache@v5
with:
# Private source and build outputs stay out of the public cache.
path: |
~/.cargo/registry/cache
~/.cargo/registry/index
key: nsh-crates-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('source/gpgui/apps/desktop-nsh/Cargo.lock') }}
restore-keys: nsh-crates-${{ runner.os }}-${{ runner.arch }}-
- name: Check demo-free NSH production
timeout-minutes: 30
run: |
trap 'code=$?; if [ "$code" -ne 0 ]; then echo "::error::NSH production check failed; diagnostics suppressed."; fi' EXIT
(
set -euo pipefail
cd source/gpgui
cargo +1.97.0 check --manifest-path apps/desktop-nsh/Cargo.toml --locked --bin gp-connect-nsh
) >/dev/null 2>&1
echo "NSH production check passed."
- name: Compile NSH tests
timeout-minutes: 30
run: |
trap 'code=$?; if [ "$code" -ne 0 ]; then echo "::error::NSH test compilation failed; diagnostics suppressed."; fi' EXIT
(
set -euo pipefail
cd source/gpgui
cargo +1.97.0 test --manifest-path apps/desktop-nsh/Cargo.toml --locked --features demo --no-run
) >/dev/null 2>&1
echo "NSH test compilation passed."
- name: Run NSH tests
timeout-minutes: 10
run: |
trap 'code=$?; if [ "$code" -ne 0 ]; then echo "::error::NSH tests failed; diagnostics suppressed."; fi' EXIT
(
set -euo pipefail
cd source/gpgui
cargo +1.97.0 test --manifest-path apps/desktop-nsh/Cargo.toml --locked --features demo -- --test-threads=1
) >/dev/null 2>&1
echo "NSH tests passed."
+8 -1
View File
@@ -12,6 +12,13 @@ on:
required: true
type: string
expected_gui:
description: 'Expected macOS shell in the selected build artifact'
required: true
default: tauri
type: choice
options: [tauri, nsh]
concurrency:
group: publish-macos-assets
cancel-in-progress: false
@@ -66,7 +73,7 @@ jobs:
RELEASE_TAG: ${{ inputs.release_tag }}
WORKFLOW_COMMIT: ${{ steps.build.outputs.workflow_commit }}
ARTIFACT_NAME: ${{ steps.build.outputs.artifact }}
EXPECTED_GUI: tauri
EXPECTED_GUI: ${{ inputs.expected_gui }}
run: |
set -euo pipefail
metadata="$(python3 scripts/validate-macos-release.py release-assets \