CI: reuse setup steps

42LoCo42 · May 23, 2024 · f63c6a5 · f63c6a5
1 parent 06b2075
commit f63c6a5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -0,0 +1,12 @@
+steps:
+  - name: Checkout the repo
+    uses: actions/checkout@v4
+    with:
+      ref: ${{ github.head_ref }}
+
+  - name: Install Nix
+    uses: cachix/install-nix-action@v25
+    with:
+      extra_nix_config: |
+        substituters = https://cache.nixos.org https://42loco42.cachix.org https://attic.eleonora.gay/default
+        trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= 42loco42.cachix.org-1:6HvWFER3RdTSqEZDznqahkqaoI6QCOiX2gRpMMsThiQ= default:XPg5h4CW7EI+JTHIwsCTDSw+KxNHQoujFcUoc7a0mDQ=
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: build-all
+name: "Run the primary CI"
 
 on:
   workflow_dispatch:
@@ -10,15 +10,7 @@ jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v4
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v25
-        with:
-          extra_nix_config: |
-            substituters = https://cache.nixos.org https://42loco42.cachix.org https://attic.eleonora.gay/default
-            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= 42loco42.cachix.org-1:6HvWFER3RdTSqEZDznqahkqaoI6QCOiX2gRpMMsThiQ= default:XPg5h4CW7EI+JTHIwsCTDSw+KxNHQoujFcUoc7a0mDQ=
+      - uses: 42loco42/obscura/.github/actions/setup
 
       - name: Run CI
         run: nix run .#ci

diff --git a/.github/workflows/nvidia.yaml b/.github/workflows/nvidia.yaml
@@ -1,4 +1,4 @@
-name: Build NVIDIA stuff every day at 3:00
+name: "Build NVIDIA packages"
 
 on:
   workflow_dispatch:
@@ -11,19 +11,9 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v25
-        with:
-          extra_nix_config: |
-            substituters = https://cache.nixos.org https://42loco42.cachix.org https://attic.eleonora.gay/default
-            trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= 42loco42.cachix.org-1:6HvWFER3RdTSqEZDznqahkqaoI6QCOiX2gRpMMsThiQ= default:XPg5h4CW7EI+JTHIwsCTDSw+KxNHQoujFcUoc7a0mDQ=
+      - uses: 42loco42/obscura/.github/actions/setup
 
-      - name: Update, build, push
+      - name: Update, build, push to cache
         run: |
           old="$(sha256sum flake.lock)"
           nix flake update nixpkgs-new