chore: merge branch main-v0.13.2 into main (resolve conflicts)

.github/workflows/main.yml

@@ -89,34 +89,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/install_rust
-<<<<<<< HEAD
       - uses: Swatinem/rust-cache@v2
       - uses: Noelware/setup-protoc@1.1.0
         with:
           version: ${{env.PROTOC_VERSION}}
       - run: cargo doc --workspace -r --document-private-items --no-deps
-||||||| 9e02307ff
-        with:
-          components: rustfmt, clippy
-
-      # Run tests.
-      - name: "Run rustfmt and clippy"
-        run: scripts/rust_fmt.sh --check
-      - name: "Run clippy"
-        run: scripts/clippy.sh
-      - name: "Run cargo doc"
-        run: cargo doc --workspace -r --document-private-items --no-deps
-      - name: "Run taplo"
-        run: scripts/taplo.sh
-      - name: "Run cargo check"
-        env:
-          RUSTDOCFLAGS: "-D warnings"
-        run: cargo check --workspace -r --all-features
-      - name: Run Machete (detect unused dependencies)
-        uses: bnjbvr/cargo-machete@main
-
-=======
-
+
       # Run tests.
       - name: "Run rustfmt and clippy"
         run: scripts/rust_fmt.sh --check
@@ -133,7 +111,6 @@ jobs:
       - name: Run Machete (detect unused dependencies)
         uses: bnjbvr/cargo-machete@main
 
->>>>>>> origin/main-v0.13.2
 
   run-workspace-tests:
     runs-on: starkware-ubuntu-latest-small

commitlint.config.js

@@ -33,13 +33,8 @@ const Configuration = {
             'execution',
             'fee',
             'gateway',
-<<<<<<< HEAD
-||||||| 9e02307ff
-            'helm',
-=======
             'helm',
             'infra',
->>>>>>> origin/main-v0.13.2
             'JSON-RPC',
             'load_test',
             'mempool_infra',