Merge branch 'main' into dependabot/github_actions/actions/checkout-5

.github/dependabot.yml

@@ -4,6 +4,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "main"
+    rebase-strategy: "auto"
     labels:
       - "dependencies"
       - "github-actions"
@@ -12,8 +14,9 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "main"
+    rebase-strategy: "auto"
     labels:
       - "dependencies"
       - "python"
     open-pull-requests-limit: 10
-

.github/workflows/ci.yml

@@ -44,4 +44,3 @@ jobs:
     - name: Test console script entry point
       run: |
         djinit --help
-

.github/workflows/codeql.yml

@@ -31,4 +31,3 @@ jobs:
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3
-

.github/workflows/dependabot-auto-merge.yml

@@ -23,6 +23,7 @@ jobs:
           steps.metadata.outputs.update-type == 'version-update:semver-patch'
         uses: actions/github-script@v7
         with:
+          github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN || secrets.GITHUB_TOKEN }}
           script: |
             await github.pulls.createReview({
               owner: context.repo.owner,
@@ -37,6 +38,5 @@ jobs:
           steps.metadata.outputs.update-type == 'version-update:semver-patch'
         uses: peter-evans/enable-pull-request-automerge@v3
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN || secrets.GITHUB_TOKEN }}
           merge-method: squash
-

.github/workflows/pre-commit.yml

@@ -27,4 +27,3 @@ jobs:
     - name: Run pre-commit
       run: |
         pre-commit run --all-files
-