From 138684a84fa8495ba155c2c7058e163f9e11955c Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sat, 1 Feb 2025 22:54:26 -0500 Subject: [PATCH 1/2] Revert "ci: add nix out paths to job summary" This reverts commit 588e0d6305e673fc4e5eceebfe2692d30b8e876a. Signed-off-by: Seth Flynn --- .github/workflows/nix.yml | 50 ++++----------------------------------- 1 file changed, 4 insertions(+), 46 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index b6abce79e..0792b172c 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -77,54 +77,12 @@ jobs: run: | nix flake check --print-build-logs --show-trace - - name: Select debug package + - name: Build debug package if: ${{ env.DEBUG }} run: | - echo "installable='.#prismlauncher-debug'" >> "$GITHUB_ENV" + nix build --print-build-logs .#prismlauncher-debug - - name: Select release package + - name: Build release package if: ${{ !env.DEBUG }} run: | - echo "installable='.#prismlauncher'" >> "$GITHUB_ENV" - - - name: Build package - run: | - nix build \ - --no-link --print-build-logs --print-out-paths \ - "$installable" >> "$RUNNER_TEMP"/out-paths - - - name: Upload out paths - uses: actions/upload-artifact@v4 - with: - name: ${{ matrix.system }}-out-paths - path: ${{ runner.temp }}/out-paths - - release-gate: - name: Release gate - - if: ${{ always() }} - needs: [ build ] - - runs-on: ubuntu-22.04 - - steps: - - name: Recover out paths - uses: actions/download-artifact@v4 - - - name: Make job summary - run: | - { - for artifact in *-out-paths/; do - basename="$(basename "$artifact")" - echo "# ${basename/%-out-paths/}" - echo - echo '```' - cat "$artifact"/out-paths - echo '```' - echo - done - } >>"$GITHUB_STEP_SUMMARY" - - - name: Exit with error - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }} - run: exit 1 + nix build --print-build-logs .#prismlauncher From 989e6c6cb6a400a217db302a71ae2d242ca5b013 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sat, 1 Feb 2025 22:55:39 -0500 Subject: [PATCH 2/2] ci: directly print nix out paths to step summary Signed-off-by: Seth Flynn --- .github/workflows/nix.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 0792b172c..09e3dee1f 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -80,9 +80,13 @@ jobs: - name: Build debug package if: ${{ env.DEBUG }} run: | - nix build --print-build-logs .#prismlauncher-debug + nix build \ + --no-link --print-build-logs --print-out-paths \ + .#prismlauncher-debug >> "$GITHUB_STEP_SUMMARY" - name: Build release package if: ${{ !env.DEBUG }} run: | - nix build --print-build-logs .#prismlauncher + nix build \ + --no-link --print-build-logs --print-out-paths \ + .#prismlauncher >> "$GITHUB_STEP_SUMMARY"