aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authordiniamo <[email protected]>2024-09-08 20:20:45 +0200
committerGitHub <[email protected]>2024-09-08 21:20:45 +0300
commit07a21fdfa9e4d3827457dc3f08a4910703fedd35 (patch)
tree477c35882907f8b2a9e712a8044532318543c137
parent0f594732b063a90d44df8c5d402d658f27471dfe (diff)
downloadHyprland-07a21fdfa9e4d3827457dc3f08a4910703fedd35.tar.gz
Hyprland-07a21fdfa9e4d3827457dc3f08a4910703fedd35.zip
github(nix-build): switch to better nix installer, attempt at fixing hash mismatch (#7701)
* github(nix-build): switch to DeterminateSystems/nix-installer-action * github(nix-build): switch to a direct git reference instead of cloning * github(nix-ci): attempt to fix CI for pull requests
-rw-r--r--.github/workflows/nix-build.yml11
-rw-r--r--.github/workflows/nix-ci.yml3
2 files changed, 4 insertions, 10 deletions
diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml
index ed0c2ae1..50823629 100644
--- a/.github/workflows/nix-build.yml
+++ b/.github/workflows/nix-build.yml
@@ -16,17 +16,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- - name: Clone repository
- uses: actions/checkout@v4
- with:
- ref: ${{ github.ref }}
- submodules: recursive
-
- - uses: cachix/install-nix-action@v27
+ - uses: DeterminateSystems/nix-installer-action@main
- uses: DeterminateSystems/magic-nix-cache-action@main
+
- uses: cachix/cachix-action@v15
with:
name: hyprland
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- - run: nix build '.?submodules=1#${{ matrix.package }}' -L --extra-substituters "https://hyprland.cachix.org"
+ - run: nix build 'git+https://github.com/hyprwm/Hyprland?ref=${{ github.ref }}&submodules=1#${{ matrix.package }}' -L --extra-substituters "https://hyprland.cachix.org"
diff --git a/.github/workflows/nix-ci.yml b/.github/workflows/nix-ci.yml
index 2f35337d..75c19790 100644
--- a/.github/workflows/nix-ci.yml
+++ b/.github/workflows/nix-ci.yml
@@ -9,7 +9,6 @@ jobs:
secrets: inherit
build:
- if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork) && !contains(needs.*.result, 'failure')
- needs: update-inputs
+ if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork)
uses: ./.github/workflows/nix-build.yml
secrets: inherit