fixing CI

Author: xunilrj

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!"

justfile

@@ -153,20 +153,30 @@ perf-remove:
         echo "Removing canceled."
     fi
 
+# path: path to file to extract gas usage
+# open: "-o" will open the default browser showing the report
+[linux]
 [group('benchmark')]
-collect-historic-gas-usage path:
+collect-historic-gas-usage path open:
     #! /bin/bash
     mkdir -p target
     rm target/a.csv
     rm target/a.html
-    rm target/report.html
-    echo "test,gas,hash" > target/a.csv
+    echo "test,gas,commit" > target/a.csv
     for HASH in `git log --format='%H' -- {{path}}`; do
         TIMESTAMP=$(git show -s --format='%as-%ct-%H' "$HASH")
         git --no-pager show "$HASH:{{path}}" | bash -c "scripts/compare-gas-usage/extract-gas-usage.sh $TIMESTAMP" >> target/a.csv
-        ./scripts/csv2html/csv2html.sh target/a.csv >> target/a.html
     done
-    ./scripts/csv2html/htmltable2report.sh target/a.html > target/report.html
+    ./scripts/csv2html/csv2html.sh target/a.csv >> target/a.html
+    if [ -n "{{open}}" ]; then
+        if which xdg-open &>> /dev/null
+        then
+            xdg-open target/a.html
+        elif which gnome-open &>> /dev/null
+        then
+            gnome-open target/a.html
+        fi
+    fi
 
 [group('build')]
 build-prism:

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")
 

scripts/csv2html/htmltable2report.sh

@@ -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\"",