Merge pull request #29 from darksoil-studio/develop

Updated android build-tools
darksoil-studio · Aug 8, 2024 · e4d96a8 · e4d96a8
2 parents 14b663f + dbb2445
commit e4d96a8
Show file tree

Hide file tree

Showing 9 changed files with 1,287 additions and 1,221 deletions.
diff --git a/.github/workflows/build-hc-pilot.yaml b/.github/workflows/build-hc-pilot.yaml
@@ -38,5 +38,5 @@ jobs:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
           nix build --accept-flake-config -L .#hc-pilot
-          cachix push darksoil-studio $(nix --accept-flake-config path-info --accept-flake-config .#hc-pilot)
-          cachix pin darksoil-studio hc-progenitor $(nix --accept-flake-config path-info --accept-flake-config .#hc-pilot)
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#hc-pilot | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix pin darksoil-studio hc-pilot $(nix path-info --json --accept-flake-config --no-warn-dirty .#hc-pilot | nix run nixpkgs#jq -- -r 'keys[0]')
diff --git a/.github/workflows/build-scaffold-holochain-runtime.yaml b/.github/workflows/build-scaffold-holochain-runtime.yaml
@@ -49,15 +49,15 @@ jobs:
         env:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
-          cachix watch-exec darksoil-studio -- nix build --accept-flake-config -L .#scaffold-holochain-runtime
-          cachix push darksoil-studio $(nix path-info --accept-flake-config .#scaffold-holochain-runtime)
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#scaffold-holochain-runtime
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#scaffold-holochain-runtime | nix run nixpkgs#jq -- -r 'keys[0]')
 
       - name: Pin scaffold-holochain-runtime
         if: github.event_name != 'pull_request' && github.ref_name == 'main'
         env:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
           cachix watch-exec darksoil-studio -- nix build --accept-flake-config -L .#scaffold-holochain-runtime
-          cachix push darksoil-studio $(nix path-info --accept-flake-config .#scaffold-holochain-runtime)
-          cachix pin darksoil-studio scaffold-holochain-runtime $(nix path-info --accept-flake-config .#scaffold-holochain-runtime)
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#scaffold-holochain-runtime | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix pin darksoil-studio scaffold-holochain-runtime $(nix path-info --json --accept-flake-config --no-warn-dirty .#scaffold-holochain-runtime | nix run nixpkgs#jq -- -r 'keys[0]')
 
diff --git a/.github/workflows/build-scaffold-tauri-happ.yaml b/.github/workflows/build-scaffold-tauri-happ.yaml
@@ -57,7 +57,7 @@ jobs:
         env:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
-          cachix watch-exec darksoil-studio -- nix build --accept-flake-config -L .#scaffold-tauri-happ
-          cachix push darksoil-studio $(nix path-info --accept-flake-config .#scaffold-tauri-happ)
-          cachix pin darksoil-studio scaffold-tauri-happ $(nix path-info --accept-flake-config .#scaffold-tauri-happ)
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file --accept-flake-config -L .#scaffold-tauri-happ
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#scaffold-tauri-happ | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix pin darksoil-studio scaffold-tauri-happ $(nix path-info --json --accept-flake-config --no-warn-dirty .#scaffold-tauri-happ | nix run nixpkgs#jq -- -r 'keys[0]')
 
diff --git a/.github/workflows/cache-devshells.yaml b/.github/workflows/cache-devshells.yaml
@@ -4,6 +4,8 @@ on:
   # but only for the main branch
   push: 
     branches: [ main ]
+  pull_request: 
+    branches: [ main ]
 
 jobs:
   cache-devshells:
@@ -16,6 +18,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Extend space
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        uses: ./.github/actions/extend-space
+
       - name: Install nix
         uses: cachix/install-nix-action@v25
         with:
@@ -38,14 +44,15 @@ jobs:
           CACHIX_AUTH_TOKEN: "${{ secrets.DARKSOIL_CACHIX_AUTH_TOKEN }}"
         run: |
           cachix watch-exec darksoil-studio -- nix flake check --accept-flake-config -L
-          nix develop --accept-flake-config --profile holochainTauriDev -c true .#holochainTauriDev
+          nix develop --no-update-lock-file --accept-flake-config --profile holochainTauriDev -c true .#holochainTauriDev
           cachix push darksoil-studio holochainTauriDev
-          nix develop --accept-flake-config --profile holochainTauriAndroidDev -c true .#holochainTauriAndroidDev
+          nix develop --no-update-lock-file --accept-flake-config --profile holochainTauriAndroidDev -c true .#holochainTauriAndroidDev
           cachix push darksoil-studio holochainTauriAndroidDev
-          nix build .#holochainTauriRust -L --accept-flake-config 
-          nix build .#androidTauriRust -L --accept-flake-config 
-          
-          cachix push darksoil-studio $(nix path-info --accept-flake-config .#holochainTauriRust)
-          cachix push darksoil-studio $(nix path-info --accept-flake-config .#androidTauriRust)
-          cachix pin darksoil-studio holochainTauriRust $(nix path-info --accept-flake-config .#holochainTauriRust)
-          cachix pin darksoil-studio androidTauriRust $(nix path-info --accept-flake-config .#androidTauriRust)
+
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file -L --accept-flake-config .#holochainTauriRust 
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#holochainTauriRust | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix pin darksoil-studio holochainTauriRust $(nix path-info --json --accept-flake-config --no-warn-dirty .#holochainTauriRust | nix run nixpkgs#jq -- -r 'keys[0]')
+
+          cachix watch-exec darksoil-studio -- nix build --no-update-lock-file -L --accept-flake-config .#androidTauriRust
+          cachix push darksoil-studio $(nix path-info --json --accept-flake-config --no-warn-dirty .#androidTauriRust | nix run nixpkgs#jq -- -r 'keys[0]')
+          cachix pin darksoil-studio androidTauriRust $(nix path-info --json --accept-flake-config --no-warn-dirty .#androidTauriRust | nix run nixpkgs#jq -- -r 'keys[0]')
diff --git a/examples/end-user-happ/Cargo.lock b/examples/end-user-happ/Cargo.lock
diff --git a/examples/end-user-happ/flake.lock b/examples/end-user-happ/flake.lock