Merge branch 'main' into m1

juspay · Feb 11, 2024 · 42981ac · 42981ac
2 parents 168b205 + 1b7f5e6
commit 42981ac
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,12 +12,13 @@ jobs:
         os: [ubuntu-latest, macos-latest, macos-14]
     steps:
       - uses: actions/checkout@v3
-      # Don't upgrade Nix until https://github.com/srid/nixci/issues/35 is fixed
-      - uses: cachix/install-nix-action@v22
-      - run: nix --version
+      - uses: DeterminateSystems/nix-installer-action@main
+        with:
+          extra-conf: |
+            trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+            substituters = https://cache.garnix.io?priority=41 https://cache.nixos.org/
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - uses: yaxitech/nix-install-pkgs-action@v3
         with:
-          inputs-from: ./dev
-          packages: "nixpkgs#nixci"
+          packages: "github:srid/nixci"
       - run: nixci
diff --git a/test/flake.nix b/test/flake.nix
@@ -37,15 +37,15 @@
               };
           in
           builtins.listToAttrs (builtins.map mkPackageFor [
-            ../nix/apache-kafka_test.nix
-            ../nix/clickhouse/clickhouse_test.nix
-            ../nix/elasticsearch_test.nix
-            ../nix/mysql_test.nix
-            ../nix/nginx_test.nix
-            ../nix/postgres/postgres_test.nix
-            ../nix/redis_test.nix
-            ../nix/redis-cluster_test.nix
-            ../nix/zookeeper_test.nix
+            "${inputs.services-flake}/nix/apache-kafka_test.nix"
+            "${inputs.services-flake}/nix/clickhouse/clickhouse_test.nix"
+            "${inputs.services-flake}/nix/elasticsearch_test.nix"
+            "${inputs.services-flake}/nix/mysql_test.nix"
+            "${inputs.services-flake}/nix/nginx_test.nix"
+            "${inputs.services-flake}/nix/postgres/postgres_test.nix"
+            "${inputs.services-flake}/nix/redis_test.nix"
+            "${inputs.services-flake}/nix/redis-cluster_test.nix"
+            "${inputs.services-flake}/nix/zookeeper_test.nix"
           ]);
       };
     };