ci: update gpgui desktop paths

This commit is contained in:
Kevin Yue committed 2026-08-12 16:25:56 +08:00
1 parent aa41998e58
commit 59102edfb5
2 files changed
+28 -27

No files matched your search

+7 -7
View File
@@ -493,7 +493,7 @@ jobs:
path: gpgui-frontend/gpgui
- name: Build gpgui frontend
run: |
cd gpgui-frontend/gpgui/app
cd gpgui-frontend/gpgui/apps/desktop
pnpm install --frozen-lockfile
pnpm build
- name: Upload gpgui frontend
@@ -501,7 +501,7 @@ jobs:
with:
name: bsd-gpgui-frontend
if-no-files-found: error
path: gpgui-frontend/gpgui/app/dist/**
path: gpgui-frontend/gpgui/apps/desktop/dist/**
build-bsd:
needs:
@@ -535,7 +535,7 @@ jobs:
uses: actions/download-artifact@v8
with:
name: bsd-gpgui-frontend
path: ${{ matrix.workspace }}/gpgui/app/dist
path: ${{ matrix.workspace }}/gpgui/apps/desktop/dist
- name: Build on FreeBSD
if: ${{ matrix.os == 'freebsd' }}
uses: vmactions/freebsd-vm@v1
@@ -572,10 +572,10 @@ jobs:
cd "${{ matrix.workspace }}/gp"
cargo build --release --workspace
cd ../gpgui/app/src-tauri
cd ../gpgui/apps/desktop/src-tauri
cargo build --release --workspace
cd ../../../gp
cd ../../../../gp
gmake "${{ matrix.package_target }}" GPGUI_BINARY=../gpgui/target/release/gpgui
pkg install -y ".build/${{ matrix.artifact_dir }}"/artifacts/*.pkg
gpclient --version
@@ -627,10 +627,10 @@ jobs:
cd "${{ matrix.workspace }}/gp"
cargo build --release --workspace
cd ../gpgui/app/src-tauri
cd ../gpgui/apps/desktop/src-tauri
cargo build --release --workspace
cd ../../../gp
cd ../../../../gp
gmake "${{ matrix.package_target }}" GPGUI_BINARY=../gpgui/target/release/gpgui
pkg_add -D unsigned ".build/${{ matrix.artifact_dir }}"/artifacts/*.tgz
gpclient --version
+21 -20
View File
@@ -10,6 +10,7 @@ fi
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
GP_DIR="$(dirname "$SCRIPT_DIR")"
GPGUI_DIR="$1"
GPGUI_APP_DIR="$GPGUI_DIR/apps/desktop"
verify_same_file() {
local source_file="$1"
@@ -42,61 +43,61 @@ verify_absent() {
}
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/32x32.png" \
"$GPGUI_APP_DIR/src-tauri/icons/32x32.png" \
"$GP_DIR/packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/128x128.png" \
"$GPGUI_APP_DIR/src-tauri/icons/128x128.png" \
"$GP_DIR/packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/[email protected]" \
"$GPGUI_APP_DIR/src-tauri/icons/[email protected]" \
"$GP_DIR/packaging/files/usr/share/icons/hicolor/256x256/apps/gpgui.png"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/icon.png" \
"$GPGUI_APP_DIR/src-tauri/icons/icon.png" \
"$GP_DIR/packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/icon.svg" \
"$GPGUI_APP_DIR/src-tauri/icons/icon.svg" \
"$GP_DIR/packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/32x32.png" \
"$GPGUI_APP_DIR/src-tauri/icons/32x32.png" \
"$GP_DIR/apps/gpauth/icons/32x32.png"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/128x128.png" \
"$GPGUI_APP_DIR/src-tauri/icons/128x128.png" \
"$GP_DIR/apps/gpauth/icons/128x128.png"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/[email protected]" \
"$GPGUI_APP_DIR/src-tauri/icons/[email protected]" \
"$GP_DIR/apps/gpauth/icons/[email protected]"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/icon.png" \
"$GPGUI_APP_DIR/src-tauri/icons/icon.png" \
"$GP_DIR/apps/gpauth/icons/icon.png"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/32x32.png" \
"$GPGUI_APP_DIR/src-tauri/icons/32x32.png" \
"$GP_DIR/apps/gpgui-helper/src-tauri/icons/32x32.png"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/128x128.png" \
"$GPGUI_APP_DIR/src-tauri/icons/128x128.png" \
"$GP_DIR/apps/gpgui-helper/src-tauri/icons/128x128.png"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/[email protected]" \
"$GPGUI_APP_DIR/src-tauri/icons/[email protected]" \
"$GP_DIR/apps/gpgui-helper/src-tauri/icons/[email protected]"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/icon.png" \
"$GPGUI_APP_DIR/src-tauri/icons/icon.png" \
"$GP_DIR/apps/gpgui-helper/src-tauri/icons/icon.png"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/icon.svg" \
"$GPGUI_APP_DIR/src-tauri/icons/icon.svg" \
"$GP_DIR/apps/gpgui-helper/src-tauri/icons/icon.svg"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/icon.icns" \
"$GPGUI_APP_DIR/src-tauri/icons/icon.icns" \
"$GP_DIR/apps/gpgui-helper/src-tauri/icons/icon.icns"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/icon.ico" \
"$GPGUI_APP_DIR/src-tauri/icons/icon.ico" \
"$GP_DIR/apps/gpgui-helper/src-tauri/icons/icon.ico"
verify_same_file \
"$GPGUI_DIR/app/src-tauri/icons/icon-small.svg" \
"$GPGUI_APP_DIR/src-tauri/icons/icon-small.svg" \
"$GP_DIR/apps/gpgui-helper/src/assets/icon-small.svg"
verify_contains \
"$GPGUI_DIR/app/gpgui.desktop.in" \
"$GPGUI_APP_DIR/gpgui.desktop.in" \
"Exec=/usr/bin/gpclient launch-gui %u"
verify_contains \
"$GPGUI_DIR/app/gpgui.desktop.in" \
"$GPGUI_APP_DIR/gpgui.desktop.in" \
"MimeType=x-scheme-handler/globalprotectcallback;"
verify_contains \
"$GP_DIR/packaging/files/usr/share/applications/gpgui.desktop" \
@@ -110,7 +111,7 @@ verify_contains \
verify_contains \
"$GP_DIR/packaging/bsd/gpgui.desktop" \
"MimeType=x-scheme-handler/globalprotectcallback;"
verify_absent "$GPGUI_DIR/app/gpauth.desktop"
verify_absent "$GPGUI_APP_DIR/gpauth.desktop"
verify_absent "$GP_DIR/packaging/files/usr/share/applications/gpauth.desktop"
verify_absent "$GP_DIR/packaging/bsd/gpauth.desktop"