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

.github/workflows/blockifier_ci.yml

@@ -1,17 +1,14 @@
 name: Blockifier-CI
 
+# TODO(Dori, 15/8/2024): Split this job, so the feature-less build doesn't run on every push to main
+# branches.
 on:
   push:
     branches:
       - main
       - main-v[0-9].**
     tags:
       - v[0-9].**
-    paths:
-      - 'crates/blockifier/**'
-      - 'crates/native_blockifier/**'
-      - 'build_native_blockifier_in_docker.sh'
-      - 'scripts/build_native_blockifier.sh'
 
   pull_request:
     types:

.github/workflows/main.yml

@@ -165,6 +165,7 @@ jobs:
         with:
           version: ${{env.PROTOC_VERSION}}
       - run: cargo check --workspace -r --all-features
+<<<<<<< HEAD
 
   merge-gatekeeper:
     runs-on: ubuntu-latest
@@ -186,3 +187,31 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           ref: ${{github.ref}}
+||||||| 2b181fbc
+=======
+
+  merge-gatekeeper:
+    runs-on: ubuntu-latest
+    # Restrict permissions of the GITHUB_TOKEN.
+    # Docs: https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
+    permissions:
+      checks: read
+      statuses: read
+    steps:
+      - name: Run Merge Gatekeeper
+        if: github.event_name != 'merge_group'
+        uses: upsidr/merge-gatekeeper@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          timeout: 1200
+          ignored: "code-review/reviewable"
+
+      - name: Run Merge Gatekeeper in Merge Queue
+        if: github.event_name == 'merge_group'
+        uses: upsidr/merge-gatekeeper@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: ${{github.ref}}
+          timeout: 1200
+          ignored: "code-review/reviewable"
+>>>>>>> origin/main-v0.13.2