Skip to content

Commit d3c6563

Browse files
committed
CI/Nix: separate xdph from hl
1 parent 3d6476c commit d3c6563

File tree

3 files changed

+38
-59
lines changed

3 files changed

+38
-59
lines changed

.github/workflows/nix-build.yml

Lines changed: 0 additions & 56 deletions
This file was deleted.

.github/workflows/nix-ci.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Nix (CI)
1+
name: Nix
22

33
on: [push, pull_request, workflow_dispatch]
44

@@ -8,10 +8,20 @@ jobs:
88
uses: ./.github/workflows/nix-update-inputs.yml
99
secrets: inherit
1010

11-
build:
11+
hyprland:
1212
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork)
13-
uses: ./.github/workflows/nix-build.yml
13+
uses: ./.github/workflows/nix.yml
1414
secrets: inherit
15+
with:
16+
command: nix build 'github:hyprwm/Hyprland?ref=${{ github.ref }}' -L --extra-substituters "https://hyprland.cachix.org"
17+
18+
xdph:
19+
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork)
20+
needs: hyprland
21+
uses: ./.github/workflows/nix.yml
22+
secrets: inherit
23+
with:
24+
command: nix build 'github:hyprwm/Hyprland?ref=${{ github.ref }}#xdg-desktop-portal-hyprland' -L --extra-substituters "https://hyprland.cachix.org"
1525

1626
test:
1727
if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork)

.github/workflows/nix.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Build
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
command:
7+
required: true
8+
type: string
9+
description: Command to run
10+
secrets:
11+
CACHIX_AUTH_TOKEN:
12+
required: false
13+
14+
jobs:
15+
build:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: DeterminateSystems/nix-installer-action@main
19+
20+
- uses: cachix/cachix-action@v15
21+
with:
22+
name: hyprland
23+
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
24+
25+
- run: ${{ inputs.command }}

0 commit comments

Comments
 (0)