Fixed zome and sweettest compilation

holochain-open-dev · Jun 3, 2024 · 219c2f1 · 219c2f1
1 parent 284d574
commit 219c2f1
Show file tree

Hide file tree

Showing 10 changed files with 350 additions and 379 deletions.
diff --git a/.github/workflows/test-nix.yml b/.github/workflows/test-nix.yml
@@ -3,9 +3,9 @@ on:
   # Trigger the workflow on push or pull request,
   # but only for the main branch
   push: 
-    branches: [ main, develop ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, develop ]
+    branches: [ main ]
 
 jobs:
   linux-build-and-cache:
@@ -31,6 +31,13 @@ jobs:
           cachix watch-exec holochain-open-dev -- nix build -L .#my_zome
           sha256sum result
 
+      - name: Test zomes
+        env:
+          CACHIX_AUTH_TOKEN: "${{ secrets.CACHIX_TOKEN_HOLOCHAIN_OPEN_DEV }}"
+        run: |
+          cd ./nix/fixtures/module-repo
+          cachix watch-exec holochain-open-dev -- nix flake check -L 
+
   macos-just-get-from-cache:
     needs: linux-build-and-cache
     runs-on: macos-latest

diff --git a/.github/workflows/update-flake-inputs.yml b/.github/workflows/update-flake-inputs.yml
@@ -31,6 +31,12 @@ jobs:
           nix flake update
           nix develop
 
+      - name: Update example repository
+        run: |
+          cd nix/fixture/module-repo
+          nix flake update
+          nix develop --command bash -c "cargo update"
+
       - uses: dorny/paths-filter@v3
         id: changes
         with:
@@ -39,6 +45,8 @@ jobs:
               - 'flake.lock'
             package_json:
               - '**/*/package.json'
+            cargo_lock:
+              - '**/*/Cargo.lock'
 
       - name: Create Pull Request
         id: cpr

diff --git a/flake.nix b/flake.nix
@@ -100,8 +100,9 @@
                 CARGO_PROFILE = if debug then "debug" else "release";
                 cargoExtraArgs = "";
                 cargoCheckCommand = "";
-                cargoBuildCommand = ''
-                  RUSTFLAGS="--remap-path-prefix $(pwd)=/build/source/ --remap-path-prefix ${cargoVendorDir}=/build/source/" cargo build --profile release --offline --workspace'';
+                # RUSTFLAGS="--remap-path-prefix $(pwd)=/build/source/ --remap-path-prefix ${cargoVendorDir}=/build/source/" 
+                cargoBuildCommand =
+                  "cargo build --profile release --offline --workspace";
               };
               cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
                 pname = "zome";
@@ -119,14 +120,15 @@
               cargoArtifacts = craneLib.buildDepsOnly {
                 inherit src buildInputs nativeBuildInputs cargoVendorDir;
                 doCheck = false;
-                cargoBuildCommand = ''
-                  RUSTFLAGS="--remap-path-prefix $(pwd)=/build/source/" cargo build --profile release'';
-                cargoCheckCommand = ''
-                  RUSTFLAGS="--remap-path-prefix $(pwd)=/build/source/" cargo check --profile release'';
+                # RUSTFLAGS =
+                #   "--remap-path-prefix ${cargoVendorDir}=/build/source/";
+                cargoBuildCommand =
+                  "cargo build --profile release --tests --offline --workspace";
+                cargoCheckCommand = "";
+                cargoExtraArgs = "";
                 # CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS =
                 #   " -Clink-arg=-fuse-ld=mold";
                 CARGO_PROFILE = if debug then "debug" else "release";
-                cargoExtraArgs = " --tests --offline";
                 pname = "sweettest";
                 version = "for-holochain-0.3.1-rc";
               };