Merge branch 'reuse-om-config' of github.com:juspay/omnix into reuse-…

…om-config
juspay · Nov 14, 2024 · a68d5d1 · a68d5d1
2 parents 73c4d0a + 30aee76
commit a68d5d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -94,8 +94,16 @@ jobs:
 
       # Push the Nix cache
       - name: Push to cachix
-        if: github.ref == 'refs/heads/main'
-        run: nix --option system "${{ matrix.system }}" run .#cachix-push
+        env:
+          CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }} 
+        if: env.BRANCH_NAME == 'main'
+        run: |
+          nix run github:juspay/cachix-push -- \
+            --subflake omnix \
+            --prefix "${BRANCH_NAME}" \
+            --cache om \
+            < $HOME/omci.json
 
   static-binary-check:
     needs: main

diff --git a/crates/omnix-ci/src/command/core.rs b/crates/omnix-ci/src/command/core.rs
@@ -46,11 +46,11 @@ impl Command {
         }
     }
 
-    /// Get the flake ref associated with this subcommand
-    fn get_flake_ref(&self) -> FlakeRef {
+    /// Get the [FlakeRef] associated with this subcommand
+    fn get_flake_ref(&self) -> &FlakeRef {
         match self {
-            Command::Run(cmd) => cmd.flake_ref.clone(),
-            Command::DumpGithubActionsMatrix(cmd) => cmd.flake_ref.clone(),
+            Command::Run(cmd) => &cmd.flake_ref,
+            Command::DumpGithubActionsMatrix(cmd) => &cmd.flake_ref,
         }
     }