fixing CI

xunilrj · xunilrj · commit 3bedde095e43 · 2025-10-20T15:22:29.000-03:00
diff --git a/forc-plugins/forc-doc/tests/fixtures/sample_workspace/Forc.lock b/forc-plugins/forc-doc/tests/fixtures/sample_workspace/Forc.lock
@@ -12,4 +12,5 @@ dependencies = [
 
 [[package]]
 name = "std"
-source = "path+from-root-0CDB23161116D3A1"
+version = "0.69.0"
+source = "registry+std?0.69.0#QmSeLFUtVXk8i13owCv87Kga1MfsYgfn7sdj6WimxLwq2g!"
diff --git a/scripts/bisect-forc/bisect-forc.sh b/scripts/bisect-forc/bisect-forc.sh
@@ -20,7 +20,15 @@ compile_and_cp_to_cache() {
     fi
 }
 
-
+run_cargo() {
+    if [ "$2" = "" ]; then
+        bash -c "$CACHE/$CACHENAME build --path $PROJ" &>> /dev/null
+        echo "$?"
+    else
+        bash -c "$CACHE/$CACHENAME $2 --path $PROJ" &>> /dev/null
+        echo "$?"
+    fi
+}
 
 INITIAL_COMMIT="$(git show -s --format='%H' HEAD)"
 END_COMMIT=""
@@ -39,15 +47,6 @@ git log -1 --oneline
 echo -n "Running: "
 
 CACHENAME="$(git show -s --format='%as-%ct-%H' HEAD)"
-run_cargo() {
-    if [ "$2" = "" ]; then
-        bash -c "$CACHE/$CACHENAME build --path $PROJ" &>> /dev/null
-        echo "$?"
-    else
-        bash -c "$CACHE/$CACHENAME $2 --path $PROJ" &>> /dev/null
-        echo "$?"
-    fi
-}
 compile_and_cp_to_cache "$CACHENAME"
 INITIAL_COMPILATION_STATUS=$(run_cargo "$1" "$2")
 
diff --git a/scripts/csv2html/csv2html.sh b/scripts/csv2html/csv2html.sh
@@ -57,4 +57,8 @@ tail -n +2 "$1" | sed -e 's/^/<tr><td>/' -e 's/,/<\/td><td>/g' -e 's/$/<\/td><\/
 echo "      </tbody>
         </table>
     <body>
+<<<<<<< HEAD
 </html>"
+=======
+</html>"
+>>>>>>> bdd5b43f5 (fixing CI)
diff --git a/scripts/csv2html/htmltable2report.sh b/scripts/csv2html/htmltable2report.sh
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call/snapshot.toml b/test/src/e2e_vm_tests/test_programs/should_pass/test_contracts/const_of_contract_call/snapshot.toml
@@ -1,6 +1,4 @@
 cmds = [
-    #"echo This test will first run all test together. In this way we can measure the cost of contract method selection.",
-    #"echo After that, each test will be run isolated, giving a more precise cost of encoding/decoding boilerplate for each type.",
     "forc test --path {root} --release --experimental const_generics",
     { repeat = "for-each-block", cmds = [
         "replace-file src/main.sw \"fn cost_of_in\" \"fn isolated_cost_of_in\"",
