Merge pull request #81 from cachix/test-nix-master

domenkozar · web-flow · commit 73e75d1a0cd4 · 2021-04-06T12:18:23.000+02:00
test nix master with cachix
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 name: "cachix-action test"
 on:
   pull_request:
-  push:    
+  push:
     branches:
       - master
 
@@ -42,6 +42,7 @@ jobs:
     - run: nix-build test.nix
 
   private-cache:
+    if: ${{ github.ref == 'refs/heads/master' }}
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
@@ -76,3 +77,25 @@ jobs:
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
         installCommand: 'nix-env -j8 -f https://cachix.org/api/v1/install -iA cachix'
     - run: nix-build test.nix
+
+  nix-master:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Nix
+      uses: cachix/install-nix-action@v13
+      with: 
+        nix_path: nixpkgs=channel:nixos-20.03
+        install_url: https://nixos-nix-install-tests.cachix.org/serve/lb41az54kzk6j12p81br4bczary7m145/install
+        install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
+    - run: yarn install --frozen-lockfile
+    - run: yarn build
+    - name: Test public cache
+      uses: ./
+      with:
+        name: cachix-action
+        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+    - run: nix-build test.nix
diff --git a/dist/main/list-nix-store.sh b/dist/main/list-nix-store.sh
@@ -12,6 +12,10 @@ for file in /nix/store/*; do
     # Skip .check file produced by --keep-failed
     continue
     ;;
+  *.lock)
+    # Skip .lock files
+    continue
+    ;;
   *)
     echo "$file"
     ;;
