Merge remote-tracking branch 'origin/no-wasm-opt' into moc-inline-wit…

…h-new-meter-alloc
dfinity · Sep 17, 2023 · 2ce07c0 · 2ce07c0
2 parents 5fd2146 + 36ce70b
commit 2ce07c0
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 deletions.
diff --git a/crypto/motoko/mops.template.toml b/crypto/motoko/mops.template.toml
@@ -1,4 +1,4 @@
 [dependencies]
 base = "https://github.com/dfinity/motoko-base#moc-$MOC_VERSION"
-sha2 = "0.0.2"
+sha2 = "0.0.4"
 ic-certification = "https://github.com/nomeata/ic-certification#main"
diff --git a/dapps/Makefile b/dapps/Makefile
@@ -4,7 +4,7 @@ include ../*.mk
 all: build perf
 
 motoko:
-	$(call build,motoko)
+	$(call build_with_mops,motoko)
 
 rust:
 	$(call build,rust)

diff --git a/dapps/motoko/dfx.json b/dapps/motoko/dfx.json
@@ -6,5 +6,11 @@
     "basic_dao": {
       "main": "basic_dao/Main.mo"
     }
+  },
+  "defaults": {
+    "build": {
+      "packtool": "mops sources",
+      "args": ""
+    }
   }
 }
diff --git a/dapps/motoko/mops.template.toml b/dapps/motoko/mops.template.toml
@@ -0,0 +1,2 @@
+[dependencies]
+base = "https://github.com/dfinity/motoko-base#moc-$MOC_VERSION"
diff --git a/pub-sub/Makefile b/pub-sub/Makefile
@@ -4,7 +4,7 @@ include ../*.mk
 all: build perf
 
 motoko:
-	$(call build,motoko)
+	$(call build_with_mops,motoko)
 
 rust:
 	$(call build,rust)

diff --git a/pub-sub/motoko/dfx.json b/pub-sub/motoko/dfx.json
@@ -6,5 +6,11 @@
     "sub": {
       "main": "src/sub/Main.mo"
     }
+  },
+  "defaults": {
+    "build": {
+      "packtool": "mops sources",
+      "args": ""
+    }
   }
-}
+}
diff --git a/pub-sub/motoko/mops.template.toml b/pub-sub/motoko/mops.template.toml
@@ -0,0 +1,2 @@
+[dependencies]
+base = "https://github.com/dfinity/motoko-base#moc-$MOC_VERSION"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[dependencies]
		base = "https://github.com/dfinity/motoko-base#moc-$MOC_VERSION"