Skip to content

Commit 65d8a54

Browse files
committed
refactor(gh-actions): Always run on this repo from github.sha
1 parent 94de007 commit 65d8a54

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

.github/print-matrix/action.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,8 @@ runs:
5757
CACHIX_CACHE: ${{ inputs.cachix-cache }}
5858
CACHIX_AUTH_TOKEN: ${{ inputs.cachix-auth-token }}
5959
PRECALC_MATRIX: ${{ inputs.precalc_matrix }}
60-
run: |
61-
if [ "${{ github.repository }}" != "metacraft-labs/nixos-modules" ]; then
62-
nix run --accept-flake-config github:metacraft-labs/nixos-modules#mcl print_table
63-
else
64-
nix run --accept-flake-config .#mcl print_table
65-
fi
66-
cat comment.md
60+
MCL_BRANCH: ${{ github.repository == 'metacraft-labs/nixos-modules' && github.sha || 'main' }}
61+
run: nix run --accept-flake-config github:metacraft-labs/nixos-modules/${{ env.MCL_BRANCH }}#mcl print_table
6762

6863
- name: Update GitHub Comment
6964
uses: marocchino/[email protected]

.github/workflows/ci.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,9 @@ jobs:
6767

6868
- name: Generate Matrix for Matrix
6969
id: generate-matrix
70-
run: |
71-
if [ "${{ github.repository }}" != "metacraft-labs/nixos-modules" ]; then
72-
nix run --accept-flake-config github:metacraft-labs/nixos-modules#mcl shard_matrix
73-
else
74-
nix run --accept-flake-config .#mcl shard_matrix
75-
fi
70+
env:
71+
MCL_BRANCH: ${{ github.repository == 'metacraft-labs/nixos-modules' && github.sha || 'main' }}
72+
run: nix run --accept-flake-config github:metacraft-labs/nixos-modules/${{ env.MCL_BRANCH }}#mcl shard_matrix
7673
outputs:
7774
gen_matrix: ${{ steps.generate-matrix.outputs.gen_matrix }}
7875

@@ -103,12 +100,8 @@ jobs:
103100
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
104101
FLAKE_PRE: ${{ matrix.prefix }}
105102
FLAKE_POST: ${{ matrix.postfix }}
106-
run: |
107-
if [ "${{ github.repository }}" != "metacraft-labs/nixos-modules" ]; then
108-
nix run --accept-flake-config github:metacraft-labs/nixos-modules#mcl ci_matrix
109-
else
110-
nix run --accept-flake-config .#mcl ci_matrix
111-
fi
103+
MCL_BRANCH: ${{ github.repository == 'metacraft-labs/nixos-modules' && github.sha || 'main' }}
104+
run: nix run --accept-flake-config github:metacraft-labs/nixos-modules/${{ env.MCL_BRANCH }}#mcl ci_matrix
112105

113106
- uses: actions/upload-artifact@v4
114107
with:
@@ -244,4 +237,5 @@ jobs:
244237
CACHIX_CACHE: ${{ vars.CACHIX_CACHE }}
245238
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
246239
CACHIX_ACTIVATE_TOKEN: '${{ secrets.CACHIX_ACTIVATE_TOKEN }}'
247-
run: nix run --accept-flake-config github:metacraft-labs/nixos-modules#mcl deploy_spec
240+
MCL_BRANCH: ${{ github.repository == 'metacraft-labs/nixos-modules' && github.sha || 'main' }}
241+
run: nix run --accept-flake-config github:metacraft-labs/nixos-modules/${{ env.MCL_BRANCH }}#mcl deploy_spec

0 commit comments

Comments
 (0)