Merge branch 'main' into feat/Moliholy/asset-conversion-pallet

paritytech · Nov 27, 2023 · 053556d · 053556d
2 parents eab6896 + 2911c31
commit 053556d
Show file tree

Hide file tree

Showing 48 changed files with 1,568 additions and 4,461 deletions.
diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
@@ -19,7 +19,7 @@ jobs:
           images: paritytech/trappist
 
       - name: Build Docker image
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #v5.0.0
+        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 #v5.1.0
         with:
           file: docker/trappist-parachain.dockerfile
           push: false

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
@@ -25,7 +25,7 @@ jobs:
           images: paritytech/trappist
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 #v5.0.0
+        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 #v5.1.0
         with:
           file: docker/trappist-parachain.dockerfile
           push: true

diff --git a/.github/workflows/try-runtime.yml b/.github/workflows/try-runtime.yml
@@ -39,6 +39,6 @@ jobs:
           echo "---------- Running try-runtime for Trappist ----------"
           cargo build -p trappist --locked --release --no-default-features --features trappist/trappist-runtime,try-runtime && \
           try-runtime --runtime ./target/release/wbuild/trappist-runtime/target/wasm32-unknown-unknown/release/trappist_runtime.wasm \
-              on-runtime-upgrade live --uri wss://rococo-trappist-try-runtime-node.parity-chains.parity.io:443
+              on-runtime-upgrade --checks pre-and-post --disable-idempotency-checks live --uri wss://rococo-trappist-try-runtime-node.parity-chains.parity.io:443
         env:
           RUST_LOG: remote-ext=debug,runtime=debug