Skip to content

Commit bdeb080

Browse files
committed
fix(ci): cover packaged keyring prerequisites
1 parent 04a6d8e commit bdeb080

5 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1405,10 +1405,11 @@ jobs:
14051405
run: |
14061406
set -euo pipefail
14071407
triple="$(rustc -vV | sed -n 's/^host: //p')"
1408-
mkdir -p desktop/src-tauri/binaries desktop/src-tauri/resources/gui/dist
1408+
mkdir -p desktop/src-tauri/binaries desktop/src-tauri/resources/gui/dist desktop/src-tauri/resources/keyring
14091409
: > "desktop/src-tauri/binaries/ocx-${triple}"
14101410
chmod +x "desktop/src-tauri/binaries/ocx-${triple}"
14111411
: > desktop/src-tauri/resources/gui/dist/.keep
1412+
: > desktop/src-tauri/resources/keyring/.keep
14121413
14131414
- name: Check Rust formatting
14141415
run: cargo fmt --manifest-path desktop/src-tauri/Cargo.toml --check

‎desktop/scripts/verify-macos-runtime.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env bash
22
set -euo pipefail
33

4-
app="${1:?usage: verify-macos-runtime.sh /path/to/OpenCodex.app}"
4+
app_input="${1:?usage: verify-macos-runtime.sh /path/to/OpenCodex.app}"
5+
app="$(cd "$(dirname "$app_input")" && pwd)/$(basename "$app_input")"
56
[[ "$(uname -s)" == Darwin ]] || { echo 'macOS bundle verification requires macOS' >&2; exit 1; }
67
executable="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleExecutable' "$app/Contents/Info.plist")"
78
[[ -n "$executable" && "$executable" != */* ]] || { echo 'Invalid app executable name' >&2; exit 1; }

‎tests/ci-workflows/ci-scope-reduction.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,12 @@ describe("the native path filter", () => {
318318
"bun.lock",
319319
"desktop/**",
320320
"package.json",
321+
"scripts/build-standalone.ts",
322+
"scripts/standalone-keyring.ts",
321323
"src/cli/index.ts",
322324
"src/lib/bun-runtime.ts",
325+
"src/lib/keyring-native.ts",
326+
"src/lib/standalone.ts",
323327
"src/service/**",
324328
]);
325329
});

‎tests/ci-workflows/keyring-smoke.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ describe("packaged keyring native binding", () => {
270270
expect(ci).toContain("Verify packaged Linux sidecar keyring");
271271
expect(ci).toContain('bash desktop/scripts/verify-linux-sidecar.sh "$BUNDLE_ROOT/appimage"');
272272
const verify = readFileSync(repoPath("desktop", "scripts", "verify-macos-runtime.sh"), "utf8");
273+
expect(verify).toContain('app="$(cd "$(dirname "$app_input")" && pwd)/$(basename "$app_input")"');
273274
expect(verify).toContain("cwd=work");
274275
expect(verify).toContain('"__keyring-load-check"');
275276
expect(verify).toContain('"schema": "ocx-keyring-load/1"');

‎tests/ci-workflows/linux-desktop-packaged-ci.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ describe("Linux packaged desktop E2E in CI", () => {
3535
expect(shell?.if).toContain("needs.changes.outputs.desktop == 'true'");
3636
const checkResources = shell?.steps?.find(step => step.name === "Prepare desktop check resources");
3737
expect(checkResources?.run).toContain("binaries/ocx-");
38+
expect(checkResources?.run).toContain("resources/keyring");
3839
expect(checkResources?.run).not.toContain("resources/sidecar/ocx");
3940
const preserve = shell?.steps?.find(step => step.name === "Preserve the compiled Linux sidecar");
4041
expect(preserve?.run).toContain("chmod +x desktop/scripts/appimage-patchelf.py");

0 commit comments

Comments
 (0)