Merge branch 'main' into chralt98-increase-max-market-lifetime-2

zeitgeistpm · Feb 28, 2025 · 01878ab · 01878ab
2 parents c47ca4c + 13ef587
commit 01878ab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -30,7 +30,7 @@ jobs:
           cp target/release/wbuild/zeitgeist-runtime/zeitgeist_runtime.compact.compressed.wasm runtimes/;
 
       - name: Upload runtimes
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
           name: runtimes
           path: runtimes
@@ -41,7 +41,7 @@ jobs:
           cp target/release/zeitgeist binaries/;
 
       - name: Upload binary
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
           name: binaries
           path: binaries
@@ -80,13 +80,13 @@ jobs:
           mkdir -p integration-tests/tmp
 
       - name: Download runtime
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4
         with:
           name: runtimes
           path: target/release/wbuild/zeitgeist-runtime/
 
       - name: Download binary
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4
         with:
           name: binaries
           path: target/release
@@ -137,13 +137,13 @@ jobs:
           mkdir -p integration-tests/tmp
 
       - name: Download runtime
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4
         with:
           name: runtimes
           path: target/release/wbuild/zeitgeist-runtime/
 
       - name: Download binary
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4
         with:
           name: binaries
           path: target/release
@@ -193,7 +193,7 @@ jobs:
           mkdir -p integration-tests/tmp/node_logs
 
       - name: Download runtime
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4
         with:
           name: runtimes
           path: target/release/wbuild/battery-station-runtime/
@@ -248,7 +248,7 @@ jobs:
           mkdir -p integration-tests/tmp/node_logs
 
       - name: "Download runtime"
-        uses: actions/download-artifact@v3.0.2
+        uses: actions/download-artifact@v4
         with:
           name: runtimes
           path: target/release/wbuild/zeitgeist-runtime/

diff --git a/scripts/tests/format.sh b/scripts/tests/format.sh
@@ -66,7 +66,7 @@ taplo_fmt() {
 has_taplo=$(which taplo)
 if [ $? -eq 1 ]; then
     echo "Installing taplo ..."
-    cargo install taplo-cli --git https://github.com/tamasfe/taplo --rev 848722f2c604de68535e5a3e0bb2a2c1d3c7dc74
+    cargo install taplo-cli --locked --git https://github.com/tamasfe/taplo --rev ab68333d17afab9319d0516b311a71bde828f900
 fi
 # install rustfmt if it isn't already
 has_rustfmt=$(which rustfmt)