Breaking/pof tiebreaker

.cargo/config.toml

@@ -15,7 +15,18 @@ rustflags = ["--cfg", "tokio_unstable", "-C", "force-frame-pointers=yes", "-C",
 
 # TODO(grao): Figure out whether we should enable other cpu features, and whether we should use a different way to configure them rather than list every single one here.
 [target.x86_64-unknown-linux-gnu]
-rustflags = ["--cfg", "tokio_unstable", "-C", "link-arg=-fuse-ld=lld", "-C", "force-frame-pointers=yes", "-C", "force-unwind-tables=yes", "-C", "target-feature=+sse4.2"]
+rustflags = [
+  "--cfg",
+  "tokio_unstable",
+  "-C",
+  "link-arg=-fuse-ld=lld",
+  "-C",
+  "force-frame-pointers=yes",
+  "-C",
+  "force-unwind-tables=yes",
+  "-C",
+  "target-feature=+sse4.2",
+]
 
 # 64 bit MSVC
 [target.x86_64-pc-windows-msvc]
@@ -27,5 +38,11 @@ rustflags = [
   "-C",
   "force-unwind-tables=yes",
   "-C",
-  "link-arg=/STACK:8000000" # Set stack to 8 MB
-]
+  "link-arg=/STACK:8000000", # Set stack to 8 MB
+]
+
+[target.aarch64-apple-darwin]
+rustflags = [
+  "-C",
+  "link-arg=-L/opt/homebrew/opt/gmp",
+]

.github/workflows/ci.yaml

@@ -14,7 +14,7 @@ on:
       - "release**"
       - "main**"
   schedule:
-    - cron:  '30 00 * * *'
+    - cron: "30 00 * * *"
 
 env:
   DIEM_FORGE_NODE_BIN_PATH: ${{github.workspace}}/diem-node
@@ -216,7 +216,7 @@ jobs:
 
       - name: upgrade - should be backwards compatible
         # should always run unless we explicitly mark the branch or tag as "breaking"
-        if: ${{ ! contains(github.ref_name, 'breaking/') }}
+        if: not(contains(${{github.ref_name}}, "breaking/"))
         working-directory: ./upgrade-tests
         # NOTE: upgrade tests which compile Move code, and then submit in the same thread will cause a stack overflow with the default rust stack size.
         run: RUST_MIN_STACK=104857600 cargo test compatible_

.gitignore

@@ -1,6 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
+**/target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
@@ -24,4 +24,8 @@ sccache.log
 *.bpl
 
 # exclude diem dependency
-diem/
+diem/
+
+# exclude move coverage
+.coverage_map.mvcov
+.trace