From feefeecea976625f4c467230cbbd68edfb1d4c7d Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 7 Apr 2025 08:11:59 -0400 Subject: [PATCH 1/5] ci(nix): run on tags Signed-off-by: Seth Flynn (cherry picked from commit da3a4984909b4b1d801018bf80eb93feadc97100) --- .github/workflows/nix.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 0792b172c..9c809f37b 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -2,6 +2,8 @@ name: Nix on: push: + tags: + - "*" paths-ignore: - "**.md" - "**/LICENSE" From 1e201beb41916187ace29a1bd2ee1632b889f6b0 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 7 Apr 2025 08:11:59 -0400 Subject: [PATCH 2/5] ci(nix): ignore more paths Signed-off-by: Seth Flynn (cherry picked from commit 1a5a162727c7d9d91aefd3852c127d60179844ae) --- .github/workflows/nix.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 9c809f37b..f5f39b191 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -5,20 +5,27 @@ on: tags: - "*" paths-ignore: + - ".github/**" + - "!.github/workflows/nix.yml" + - "flatpak/" + - "scripts/" + + - ".git*" + - ".envrc" - "**.md" - - "**/LICENSE" - - ".github/ISSUE_TEMPLATE/**" - - ".markdownlint**" - - "flatpak/**" - tags: - - "*" + - "!COPYING.md" + - "renovate.json" pull_request_target: paths-ignore: + - ".github/**" + - "flatpak/" + - "scripts/" + + - ".git*" + - ".envrc" - "**.md" - - "**/LICENSE" - - ".github/ISSUE_TEMPLATE/**" - - ".markdownlint**" - - "flatpak/**" + - "!COPYING.md" + - "renovate.json" workflow_dispatch: permissions: From 71dc114a09bc59929419fe67aa0fb1bf19b7005f Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 7 Apr 2025 08:19:58 -0400 Subject: [PATCH 3/5] ci(nix): correctly parse action env vars as bools Signed-off-by: Seth Flynn (cherry picked from commit 76bec385d6803e94899028695226d872185b3d39) --- .github/workflows/nix.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index f5f39b191..7d0514608 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -71,7 +71,7 @@ jobs: # For PRs - name: Setup Nix Magic Cache - if: ${{ env.USE_DETERMINATE }} + if: ${{ env.USE_DETERMINATE == 'true' }} uses: DeterminateSystems/flakehub-cache-action@v1 # For in-tree builds @@ -87,11 +87,11 @@ jobs: nix flake check --print-build-logs --show-trace - name: Build debug package - if: ${{ env.DEBUG }} + if: ${{ env.DEBUG == 'true' }} run: | nix build --print-build-logs .#prismlauncher-debug - name: Build release package - if: ${{ !env.DEBUG }} + if: ${{ env.DEBUG == 'false' }} run: | nix build --print-build-logs .#prismlauncher From f7dbdb79be8b50cf76d8e25dd4746e60c1015ed9 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 7 Apr 2025 08:19:58 -0400 Subject: [PATCH 4/5] ci(nix): pin release packages in cachix Signed-off-by: Seth Flynn (cherry picked from commit 180292098d9c4ad87ed0d9babed92e152feb5475) --- .github/workflows/nix.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 7d0514608..478b196ea 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -93,5 +93,11 @@ jobs: - name: Build release package if: ${{ env.DEBUG == 'false' }} + env: + TAG: ${{ github.ref_name }} + SYSTEM: ${{ matrix.system }} run: | nix build --print-build-logs .#prismlauncher + nix build --no-link --print-out-paths .#prismlauncher \ + | tee -a "$GITHUB_STEP_SUMMARY" \ + | xargs cachix pin prismlauncher "$TAG"-"$SYSTEM" From 879495942a382b2a68ea112fd992f4fbad796e16 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Mon, 7 Apr 2025 08:32:30 -0400 Subject: [PATCH 5/5] revert: "feat: publish on flakehub" Flakehub requires semver. We don't use that (yet) Refs: 86cc6d3 Signed-off-by: Seth Flynn (cherry picked from commit 6386d044e3fc5ec056479e508ade4da993a81cd4) --- .github/workflows/publish.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d49eb4b8d..8a7da812e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,28 +8,6 @@ permissions: contents: read jobs: - flakehub: - name: FlakeHub - - runs-on: ubuntu-latest - - permissions: - id-token: write - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - - name: Install Nix - uses: cachix/install-nix-action@v30 - - - name: Publish on FlakeHub - uses: determinatesystems/flakehub-push@v5 - with: - visibility: "public" - winget: name: Winget