Merge branch 'main-0.3' into main-0.4

darksoil-studio · Nov 7, 2024 · 372e736 · 372e736
2 parents d081fdf + 055871e
commit 372e736
Show file tree

Hide file tree

Showing 3 changed files with 311 additions and 68 deletions.
diff --git a/.github/workflows/build-and-cache-zomes.yaml b/.github/workflows/build-and-cache-zomes.yaml
@@ -39,30 +39,30 @@ jobs:
         env:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
-          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#linked_devices_integrity
-          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices_integrity | jq -- -r 'keys[0]')
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#linked_devices_integrity.meta.debug
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices_integrity.meta.debug | jq -- -r 'keys[0]')
 
-          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#linked_devices
-          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices | jq -- -r 'keys[0]')
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#linked_devices.meta.debug
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices.meta.debug | jq -- -r 'keys[0]')
 
       - name: Pin debug zomes
         if: github.event_name != 'pull_request'
         env:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
-          cachix pin darksoil-studio linked_devices_integrity_debug $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices_integrity | jq -- -r 'keys[0]')
-          cachix pin darksoil-studio linked_devices_debug $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices | jq -- -r 'keys[0]')
+          cachix pin darksoil-studio linked_devices_integrity_debug $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices_integrity.meta.debug | jq -- -r 'keys[0]')
+          cachix pin darksoil-studio linked_devices_debug $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices.meta.debug | jq -- -r 'keys[0]')
 
       - name: Build release zomes
         if: matrix.os == 'ubuntu-latest'
         env:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
-          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#linked_devices_integrity.meta.release
-          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices_integrity.meta.release | jq -- -r 'keys[0]')
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#linked_devices_integrity
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices_integrity | jq -- -r 'keys[0]')
 
-          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#linked_devices.meta.release
-          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices.meta.release | jq -- -r 'keys[0]')
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#linked_devices
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#linked_devices | jq -- -r 'keys[0]')
 
       - name: Pin release zomes
         if: github.event_name != 'pull_request' && matrix.os == 'ubuntu-latest'