mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-21 23:05:46 +00:00
feat(nix): inline flake + psysonic derivation, wire verify into release
Supersedes PR #203's out-of-tree upstream-src layout now that the Nix build lives in the canonical repo. The flake treats `self` as the source of truth — nothing in flake.nix or psysonic.nix needs a manual version bump per release. flake.nix - `inputs.upstream-src` dropped; `src = self` throughout - Dev shell retains the full WebKitGTK / GStreamer / AppIndicator closure needed for tauri:dev on NixOS (Linux x86_64 + aarch64) nix/psysonic.nix - Version read from package.json (upstreamMeta.version removed) - `srcClean` filter excludes node_modules / dist / target / .git / result / .flatpak-builder - `cargoDeps = rustPlatform.importCargoLock` with empty `outputHashes` — sufficient for our local `[patch.crates-io]` path overrides (cpal-0.15.3, symphonia-format-isomp4) - Wraps the installed binary with LD_LIBRARY_PATH + GST_PLUGIN_PATH + GIO_EXTRA_MODULES + GDK_BACKEND=x11 + WebKit disable flags nix/upstream-sources.json - Reduced to `{ npmDepsHash }`. Placeholder for the initial commit; the verify-nix job rewrites it on every release from the actual `prefetch-npm-deps` output. .github/workflows/release.yml - New `verify-nix` job gated on `create-release` (same as the Tauri builds). Checks out `main`, installs Nix, recomputes `npmDepsHash`, refreshes `flake.lock`, runs `nix build .#psysonic --no-link` as the sanity check, then commits lock + hash updates back to `main` when they changed. - The old standalone `upstream-release-nix.yml` is intentionally not ported; its scheduled re-poll of the upstream release is redundant now that the source lives here. Tarball publishing and Cachix upload remain explicitly out of scope — those ship in a follow-up workflow tied to the cache setup.
This commit is contained in:
@@ -159,3 +159,62 @@ jobs:
|
||||
find src-tauri/target/release/bundle \
|
||||
\( -name "*.deb" -o -name "*.rpm" -o -name "*.AppImage" \) \
|
||||
| xargs gh release upload "app-v${VERSION}" --clobber
|
||||
|
||||
# Verifies that `nix build .#psysonic` still works against the current source
|
||||
# and refreshes `nix/upstream-sources.json` (npmDepsHash) + `flake.lock`
|
||||
# (nixpkgs pin). Commits the refreshed files back to `main` when they change.
|
||||
#
|
||||
# Tarball publishing / Cachix upload are intentionally out of scope here —
|
||||
# those will live in a dedicated workflow tied to a binary cache setup.
|
||||
verify-nix:
|
||||
needs: create-release
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
with:
|
||||
# Full history so we can push the auto-commit back to the default branch.
|
||||
fetch-depth: 0
|
||||
# Checkout main, not the tag — we want to push lock/hash refreshes to
|
||||
# the moving branch, not the immutable tag ref.
|
||||
ref: main
|
||||
|
||||
- name: install Nix
|
||||
uses: DeterminateSystems/nix-installer-action@v15
|
||||
|
||||
- name: compute npmDepsHash from package-lock.json
|
||||
id: npm-hash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
HASH="$(nix run nixpkgs/nixos-unstable#prefetch-npm-deps -- package-lock.json)"
|
||||
echo "hash=$HASH" >> "$GITHUB_OUTPUT"
|
||||
echo "Computed npmDepsHash: $HASH"
|
||||
|
||||
- name: write npmDepsHash into nix/upstream-sources.json
|
||||
run: |
|
||||
set -euo pipefail
|
||||
HASH='${{ steps.npm-hash.outputs.hash }}'
|
||||
jq --arg h "$HASH" '.npmDepsHash = $h' nix/upstream-sources.json > nix/upstream-sources.json.new
|
||||
mv nix/upstream-sources.json.new nix/upstream-sources.json
|
||||
cat nix/upstream-sources.json
|
||||
|
||||
- name: refresh flake.lock (nixpkgs pin)
|
||||
run: nix flake update --accept-flake-config
|
||||
|
||||
- name: verify nix build
|
||||
run: nix build .#psysonic --accept-flake-config --no-link --print-build-logs
|
||||
|
||||
- name: commit + push refreshed lock and hash (if changed)
|
||||
run: |
|
||||
set -euo pipefail
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git add flake.lock nix/upstream-sources.json
|
||||
if git diff --cached --quiet; then
|
||||
echo "flake.lock / nix/upstream-sources.json unchanged — nothing to commit."
|
||||
exit 0
|
||||
fi
|
||||
VERSION="${{ needs.create-release.outputs.package_version }}"
|
||||
git commit -m "chore(nix): refresh lock + npmDepsHash for v${VERSION}"
|
||||
git push origin HEAD:main
|
||||
|
||||
Reference in New Issue
Block a user