daemon: update tests

cachix · Jan 12, 2024 · 3a94fae · 3a94fae
1 parent a7c8acb
commit 3a94fae
Showing 1 changed file with 7 additions and 26 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,6 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        useDaemon: [true, false]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -26,12 +27,14 @@ jobs:
       with:
         name: cachix-action
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+        useDaemon: ${{ matrix.useDaemon }}
     - run: nix-build test.nix
 
   public-cache-no-signing-key:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        useDaemon: [true, false]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -42,13 +45,15 @@ jobs:
       uses: ./
       with:
         name: cachix-action
+        useDaemon: ${{ matrix.useDaemon }}
     - run: nix-build test.nix
 
   private-cache:
     if: ${{ github.ref == 'refs/heads/master' }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        useDaemon: [true, false]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -61,6 +66,7 @@ jobs:
         name: cachix-action-private
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY_PRIVATE }}'
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+        useDaemon: ${{ matrix.useDaemon }}
     - run: nix-build test.nix
 
   installCommand:
@@ -90,7 +96,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install Nix
       uses: cachix/install-nix-action@v24
-      with: 
+      with:
         nix_path: nixpkgs=channel:nixos-22.11
         install_url: https://nixos-nix-install-tests.cachix.org/serve/kkq45x7yrzvxq8627fi6hkswnfa7mg2l/install
         install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
@@ -102,28 +108,3 @@ jobs:
         name: cachix-action
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
     - run: nix-build test.nix
-
-  daemon-public-cache:
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v3
-    - uses: cachix/install-nix-action@v22
-    - run: nix profile install nixpkgs#yarn
-    - run: yarn install --frozen-lockfile
-    - run: yarn build
-    # check if typescript generation was committed
-    - run: git diff --exit-code
-    - name: Test public cache
-      uses: ./
-      with:
-        name: cachix-action
-        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-        installCommand: nix profile install github:cachix/cachix/316da07b05201376c6c29c9f0e7ce3011ab4c256 --accept-flake-config
-        useDaemon: true
-    - name: Verify that caches are set up
-      run: nix show-config | grep cachix-action.cachix.org
-    - run: nix-build test.nix
-