Merge branch 'main' into feat/add-type-hints-analysis-passes

Author: Hadar01

.github/workflows/lint.yml

@@ -31,5 +31,8 @@ jobs:
       - name: Run lint
         run: |
           set -e
+          # Check that `Cargo.lock` is checked in and up-to-date before attempting to build the
+          # package. The exact command isn't important, it should just be cheap and update the lock.
+          cargo metadata --format-version=1 --locked >/dev/null
           make cformat
           tox -e lint

.mergify.yml

@@ -6,4 +6,4 @@ pull_request_rules:
     actions:
       backport:
         branches:
-          - stable/2.3
+          - stable/2.4