Merge branch 'master' of github.com:paritytech/polkadot-sdk into feat…

…/make-westend-inflation-parameterizable
paritytech · Jul 18, 2024 · 810b2b0 · 810b2b0
2 parents 8d62d46 + 25d9b59
commit 810b2b0
Show file tree

Hide file tree

Showing 25 changed files with 124 additions and 109 deletions.
diff --git a/.github/workflows/command-fmt.yml b/.github/workflows/command-fmt.yml
@@ -37,6 +37,13 @@ jobs:
           GH_TOKEN: ${{ github.token }}
       - name: Run FMT
         run: |
+          cargo --version
+          rustc --version
+          cargo +nightly --version
+          rustc +nightly --version
+          
+          cargo +nightly fmt
+          
           # format toml.
           # since paritytech/ci-unified:bullseye-1.73.0-2023-11-01-v20231204 includes taplo-cli
           taplo format --config .config/taplo.toml

diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@
 *.orig
 *.rej
 *.swp
+*.wasm
 **/._*
 **/.criterion/
 **/*.rs.bk
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ @@
     *.orig
     *.rej
     *.swp
+    *.wasm
     **/._*
     **/.criterion/
     **/*.rs.bk
@@ Expand Down @@