diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c71b70f4..e04e9ab7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -133,18 +133,28 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + set -x VERSION=${{ needs.create-release.outputs.package_version }} - SIG=$(find src-tauri/target -path '*/release/bundle/macos/*.app.tar.gz.sig' | head -1) - if [ -z "$SIG" ]; then - echo "::error::No .sig file found under src-tauri/target/*/release/bundle/macos/" - exit 1 - fi - echo "Found signature: $SIG" - if echo "$SIG" | grep -q 'aarch64-apple-darwin'; then + TARGET_ARG='${{ matrix.settings.args }}' + if echo "$TARGET_ARG" | grep -q 'aarch64'; then + TARGET="aarch64-apple-darwin" DST="Psysonic_aarch64.app.tar.gz.sig" else + TARGET="x86_64-apple-darwin" DST="Psysonic_x64.app.tar.gz.sig" fi + + BUNDLE_DIR="src-tauri/target/${TARGET}/release/bundle/macos" + echo "=== Listing $BUNDLE_DIR ===" + ls -la "$BUNDLE_DIR" || true + echo "=== Searching whole target tree for .sig ===" + find "src-tauri/target" -name '*.sig' -type f 2>/dev/null || true + + SIG="${BUNDLE_DIR}/Psysonic.app.tar.gz.sig" + if [ ! -f "$SIG" ]; then + echo "::error::Signature not at expected path: $SIG" + exit 1 + fi cp "$SIG" "$DST" gh release upload "app-v${VERSION}" "$DST" --clobber @@ -223,6 +233,11 @@ jobs: # # The refreshed lock/hash files are committed back to `main` when they change. verify-nix: + # TEMPORARILY DISABLED during the v1.34.x testing iteration (signing + + # updater stabilisation). Remove `if: false` to re-enable — it auto-commits + # flake.lock / npmDepsHash refreshes to main on every release, which causes + # rebase friction while we're iterating fast on the release pipeline. + if: false needs: create-release runs-on: ubuntu-24.04 permissions: diff --git a/package.json b/package.json index 21bf8b47..fbdc47e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "psysonic", - "version": "1.34.16", + "version": "1.34.17", "private": true, "scripts": { "dev": "vite", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e2a55191..9bfb5a5d 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3653,7 +3653,7 @@ dependencies = [ [[package]] name = "psysonic" -version = "1.34.16" +version = "1.34.17" dependencies = [ "biquad", "discord-rich-presence", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 594aaf5b..a26bd6b3 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "psysonic" -version = "1.34.16" +version = "1.34.17" description = "Psysonic Desktop Music Player" authors = [] license = "" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 7cee5eb3..464afd0e 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Psysonic", - "version": "1.34.16", + "version": "1.34.17", "identifier": "dev.psysonic.player", "build": { "beforeDevCommand": "npm run dev",