mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-18 22:16:18 -05:00
feat: publish architecture-specific Windows update payloads
This commit is contained in:
3 files changed
+78
-14
No files matched your search
@@ -69,8 +69,10 @@ jobs:
|
|||||||
actions: read
|
actions: read
|
||||||
contents: read
|
contents: read
|
||||||
outputs:
|
outputs:
|
||||||
gp_sha: ${{ steps.sources.outputs.gp_sha }}
|
gp_sha: ${{ steps.identity.outputs.gp_sha }}
|
||||||
gpgui_sha: ${{ steps.sources.outputs.gpgui_sha }}
|
gpgui_sha: ${{ steps.identity.outputs.gpgui_sha }}
|
||||||
|
version: ${{ steps.identity.outputs.version }}
|
||||||
|
build_version: ${{ steps.identity.outputs.build_version }}
|
||||||
steps:
|
steps:
|
||||||
- name: Validate stable refs
|
- name: Validate stable refs
|
||||||
env:
|
env:
|
||||||
@@ -119,11 +121,12 @@ jobs:
|
|||||||
token: ${{ secrets.GH_PAT }}
|
token: ${{ secrets.GH_PAT }}
|
||||||
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gpgui_branch || github.ref_name }}
|
ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gpgui_branch || github.ref_name }}
|
||||||
path: selected/gpgui
|
path: selected/gpgui
|
||||||
- name: Record selected sources
|
- name: Record selected sources and versions
|
||||||
id: sources
|
id: identity
|
||||||
run: |
|
run: |
|
||||||
python3 scripts/record-build-sources.py selected-sources/sources.json \
|
python3 scripts/record-build-sources.py selected-sources/sources.json \
|
||||||
--gp selected/gp --gpgui selected/gpgui
|
--gp selected/gp --gpgui selected/gpgui \
|
||||||
|
--build-version "${{ github.run_number }}.${{ github.run_attempt }}"
|
||||||
- name: Retain selected sources for retries
|
- name: Retain selected sources for retries
|
||||||
if: steps.restored.outputs.cached != 'true'
|
if: steps.restored.outputs.cached != 'true'
|
||||||
uses: actions/upload-artifact@v7
|
uses: actions/upload-artifact@v7
|
||||||
@@ -160,7 +163,7 @@ jobs:
|
|||||||
# Tauri generates schemas in the source tree. Keep the host checkout read-only.
|
# Tauri generates schemas in the source tree. Keep the host checkout read-only.
|
||||||
cp -R /workspace /tmp/gp-test-workspace
|
cp -R /workspace /tmp/gp-test-workspace
|
||||||
cd /tmp/gp-test-workspace
|
cd /tmp/gp-test-workspace
|
||||||
cargo test --workspace --locked
|
cargo test --workspace --locked --features gpapi/openssl-tests
|
||||||
|
|
||||||
# Exercise only the paths that require an actual root process.
|
# Exercise only the paths that require an actual root process.
|
||||||
sudo -E env PATH="$PATH" PKEXEC_UID="$(id -u)" cargo test --locked -p gpapi \
|
sudo -E env PATH="$PATH" PKEXEC_UID="$(id -u)" cargo test --locked -p gpapi \
|
||||||
@@ -442,6 +445,7 @@ jobs:
|
|||||||
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
||||||
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
|
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
|
||||||
channel: ${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
channel: ${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
||||||
|
build: ${{ needs.validate-inputs.outputs.build_version }}
|
||||||
builder: gpgui-builder-tauri2
|
builder: gpgui-builder-tauri2
|
||||||
verify_desktop_assets: true
|
verify_desktop_assets: true
|
||||||
secrets:
|
secrets:
|
||||||
@@ -455,6 +459,7 @@ jobs:
|
|||||||
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
||||||
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
|
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
|
||||||
channel: ${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
channel: ${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
||||||
|
build: ${{ needs.validate-inputs.outputs.build_version }}
|
||||||
builder: gpgui-alpine-builder-tauri2
|
builder: gpgui-alpine-builder-tauri2
|
||||||
artifact_suffix: -musl
|
artifact_suffix: -musl
|
||||||
secrets:
|
secrets:
|
||||||
@@ -467,6 +472,7 @@ jobs:
|
|||||||
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
||||||
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
|
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
|
||||||
channel: ${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
channel: ${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
||||||
|
build: ${{ needs.validate-inputs.outputs.build_version }}
|
||||||
secrets:
|
secrets:
|
||||||
GH_PAT: ${{ secrets.GH_PAT }}
|
GH_PAT: ${{ secrets.GH_PAT }}
|
||||||
|
|
||||||
@@ -483,7 +489,7 @@ jobs:
|
|||||||
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
||||||
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
|
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
|
||||||
channel: ${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
channel: ${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
||||||
build: ${{ format('{0}.{1}', github.run_number, github.run_attempt) }}
|
build: ${{ needs.validate-inputs.outputs.build_version }}
|
||||||
secrets:
|
secrets:
|
||||||
GH_PAT: ${{ secrets.GH_PAT }}
|
GH_PAT: ${{ secrets.GH_PAT }}
|
||||||
WINDOWS_UPDATE_PRIVATE_KEY: ${{ secrets.WINDOWS_UPDATE_PRIVATE_KEY }}
|
WINDOWS_UPDATE_PRIVATE_KEY: ${{ secrets.WINDOWS_UPDATE_PRIVATE_KEY }}
|
||||||
@@ -682,7 +688,7 @@ jobs:
|
|||||||
FEED_URL: ${{ vars.SPARKLE_FEED_URL }}
|
FEED_URL: ${{ vars.SPARKLE_FEED_URL }}
|
||||||
CHANNEL: ${{ (github.event_name == 'workflow_dispatch' && inputs.channel || 'stable') }}
|
CHANNEL: ${{ (github.event_name == 'workflow_dispatch' && inputs.channel || 'stable') }}
|
||||||
RELEASE_TAG: ${{ (github.event_name == 'workflow_dispatch' && (inputs.channel == 'stable' && inputs.gp_branch || 'snapshot') || github.ref_name) }}
|
RELEASE_TAG: ${{ (github.event_name == 'workflow_dispatch' && (inputs.channel == 'stable' && inputs.gp_branch || 'snapshot') || github.ref_name) }}
|
||||||
BUILD_VERSION: ${{ format('{0}.{1}', github.run_number, github.run_attempt) }}
|
BUILD_VERSION: ${{ needs.validate-inputs.outputs.build_version }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
@@ -850,7 +856,7 @@ jobs:
|
|||||||
CHANNEL: ${{ (github.event_name == 'workflow_dispatch' && inputs.channel || 'stable') }}
|
CHANNEL: ${{ (github.event_name == 'workflow_dispatch' && inputs.channel || 'stable') }}
|
||||||
RELEASE_TAG: ${{ (github.event_name == 'workflow_dispatch' && (inputs.channel == 'stable' && inputs.gp_branch || 'snapshot') || github.ref_name) }}
|
RELEASE_TAG: ${{ (github.event_name == 'workflow_dispatch' && (inputs.channel == 'stable' && inputs.gp_branch || 'snapshot') || github.ref_name) }}
|
||||||
REQUEST_ID: ${{ format('{0}.{1}.macos', github.run_id, github.run_attempt) }}
|
REQUEST_ID: ${{ format('{0}.{1}.macos', github.run_id, github.run_attempt) }}
|
||||||
BUILD_VERSION: ${{ format('{0}.{1}', github.run_number, github.run_attempt) }}
|
BUILD_VERSION: ${{ needs.validate-inputs.outputs.build_version }}
|
||||||
WORKFLOW_SHA: ${{ github.sha }}
|
WORKFLOW_SHA: ${{ github.sha }}
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
@@ -1049,7 +1055,6 @@ jobs:
|
|||||||
nettle \
|
nettle \
|
||||||
gmp \
|
gmp \
|
||||||
gnome-keyring \
|
gnome-keyring \
|
||||||
libayatana-appindicator \
|
|
||||||
polkit \
|
polkit \
|
||||||
webkit2-gtk_41
|
webkit2-gtk_41
|
||||||
pkgconf --exists libxml-2.0 liblz4 gnutls p11-kit-1 hogweed nettle gmp
|
pkgconf --exists libxml-2.0 liblz4 gnutls p11-kit-1 hogweed nettle gmp
|
||||||
@@ -1058,7 +1063,7 @@ jobs:
|
|||||||
exec 3>&1
|
exec 3>&1
|
||||||
(
|
(
|
||||||
set -eu
|
set -eu
|
||||||
export GPGUI_BUILD_VERSION=${{ github.run_number }}.${{ github.run_attempt }}
|
export GPGUI_BUILD_VERSION=${{ needs.validate-inputs.outputs.build_version }}
|
||||||
export GPGUI_UPDATE_CHANNEL=${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
export GPGUI_UPDATE_CHANNEL=${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
||||||
export GPGUI_LICENSE_SIGNING_KEYS='${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}'
|
export GPGUI_LICENSE_SIGNING_KEYS='${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}'
|
||||||
|
|
||||||
@@ -1142,7 +1147,7 @@ jobs:
|
|||||||
set -eu
|
set -eu
|
||||||
export AUTOCONF_VERSION=2.72
|
export AUTOCONF_VERSION=2.72
|
||||||
export AUTOMAKE_VERSION=1.17
|
export AUTOMAKE_VERSION=1.17
|
||||||
export GPGUI_BUILD_VERSION=${{ github.run_number }}.${{ github.run_attempt }}
|
export GPGUI_BUILD_VERSION=${{ needs.validate-inputs.outputs.build_version }}
|
||||||
export GPGUI_UPDATE_CHANNEL=${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
export GPGUI_UPDATE_CHANNEL=${{ github.event_name == 'workflow_dispatch' && inputs.channel || 'stable' }}
|
||||||
export GPGUI_LICENSE_SIGNING_KEYS='${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}'
|
export GPGUI_LICENSE_SIGNING_KEYS='${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}'
|
||||||
|
|
||||||
@@ -1313,6 +1318,61 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cd gh-release/gp/scripts && ./gh-release.sh "$RELEASE_TAG"
|
cd gh-release/gp/scripts && ./gh-release.sh "$RELEASE_TAG"
|
||||||
|
|
||||||
|
publish-macos-assets:
|
||||||
|
needs: [build-macos, gh-release]
|
||||||
|
if: >-
|
||||||
|
${{ !cancelled() &&
|
||||||
|
needs.build-macos.result == 'success' && needs.gh-release.result == 'success' }}
|
||||||
|
permissions:
|
||||||
|
actions: read
|
||||||
|
contents: write
|
||||||
|
uses: ./.github/workflows/publish-macos-assets.yaml
|
||||||
|
with:
|
||||||
|
build_run_id: ${{ github.run_id }}
|
||||||
|
release_tag: ${{ github.event_name == 'workflow_dispatch' && (inputs.channel == 'stable' && inputs.gp_branch || 'snapshot') || github.ref_name }}
|
||||||
|
expected_gui: ${{ github.event_name == 'workflow_dispatch' && inputs.macos_gui || 'nsh' }}
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
|
publish-windows-snapshot-feed:
|
||||||
|
needs: [validate-inputs, gh-release, publish-macos-assets]
|
||||||
|
if: >-
|
||||||
|
${{ !cancelled() && github.event_name == 'workflow_dispatch' &&
|
||||||
|
inputs.channel == 'snapshot' && !inputs.build_only && inputs.build_windows &&
|
||||||
|
needs.gh-release.result == 'success' &&
|
||||||
|
(!inputs.build_macos || needs.publish-macos-assets.result == 'success') }}
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
uses: ./.github/workflows/publish-windows-update-feed.yaml
|
||||||
|
with:
|
||||||
|
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
|
||||||
|
release_tag: snapshot
|
||||||
|
version: ${{ needs.validate-inputs.outputs.version }}
|
||||||
|
channel: snapshot
|
||||||
|
build: ${{ needs.validate-inputs.outputs.build_version }}
|
||||||
|
highlights: Development snapshot.
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
|
publish-macos-unix-snapshot-feeds:
|
||||||
|
needs: [validate-inputs, gh-release, publish-macos-assets, publish-windows-snapshot-feed]
|
||||||
|
if: >-
|
||||||
|
${{ !cancelled() && github.event_name == 'workflow_dispatch' &&
|
||||||
|
inputs.channel == 'snapshot' && !inputs.build_only && inputs.build_macos &&
|
||||||
|
needs.gh-release.result == 'success' && needs.publish-macos-assets.result == 'success' &&
|
||||||
|
(!inputs.build_windows || needs.publish-windows-snapshot-feed.result == 'success') }}
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
uses: ./.github/workflows/publish-update-feeds.yaml
|
||||||
|
with:
|
||||||
|
gpgui_ref: ${{ needs.validate-inputs.outputs.gpgui_sha }}
|
||||||
|
gp_ref: ${{ needs.validate-inputs.outputs.gp_sha }}
|
||||||
|
channel: snapshot
|
||||||
|
release_tag: snapshot
|
||||||
|
archive_name: ${{ format('GPConnect_{0}-snapshot.{1}_arm64.zip', needs.validate-inputs.outputs.version, needs.validate-inputs.outputs.build_version) }}
|
||||||
|
expected_gui: ${{ inputs.macos_gui }}
|
||||||
|
unix_platforms: ${{ (inputs.build_bsd || inputs.build_bsd_arm64) && 'linux,freebsd,openbsd' || 'linux' }}
|
||||||
|
highlights: Development snapshot.
|
||||||
|
secrets: inherit
|
||||||
|
|
||||||
publish-docker-image:
|
publish-docker-image:
|
||||||
needs:
|
needs:
|
||||||
- validate-inputs
|
- validate-inputs
|
||||||
|
|||||||
Submodule crates/openconnect/deps/openconnect updated: 067e90c8de...f85d4f7b14.
@@ -4,9 +4,13 @@
|
|||||||
`machine-install.ps1` installation implementation. Build it with NSIS 3 Unicode:
|
`machine-install.ps1` installation implementation. Build it with NSIS 3 Unicode:
|
||||||
|
|
||||||
```powershell
|
```powershell
|
||||||
& makensis /DPAYLOAD_DIR=C:\build\payload /DOUTPUT_FILE=C:\build\GPConnect-Setup.exe /DPRODUCT_VERSION=3.4.0 /DBUILD_VERSION=3.4.0.0 /DDISPLAY_VERSION=3.4.0-snapshot.2026.1114.2 .\packaging\windows\installer.nsi
|
& makensis /DTARGET_ARCH=x64 /DPAYLOAD_DIR=C:\build\payload /DOUTPUT_FILE=C:\build\GPConnect-Setup.exe /DPRODUCT_VERSION=3.4.0 /DBUILD_VERSION=3.4.0.0 /DDISPLAY_VERSION=3.4.0-snapshot.2026.1114.2 .\packaging\windows\installer.nsi
|
||||||
```
|
```
|
||||||
|
|
||||||
|
`TARGET_ARCH` is `x64` or `arm64` and must match every executable and DLL in
|
||||||
|
the payload. Each installer accepts only its native Windows architecture. ARM64
|
||||||
|
requires Windows 11; x64 requires Windows 10 build 19041 or newer.
|
||||||
|
|
||||||
`BUILD_VERSION` must contain four numeric components. `PRODUCT_VERSION` must
|
`BUILD_VERSION` must contain four numeric components. `PRODUCT_VERSION` must
|
||||||
match the payload's `build-info.json`. `DISPLAY_VERSION` is the full release
|
match the payload's `build-info.json`. `DISPLAY_VERSION` is the full release
|
||||||
identity, including the snapshot build when applicable. The payload must contain matching
|
identity, including the snapshot build when applicable. The payload must contain matching
|
||||||
|
|||||||
Reference in new issue
Block a user