Merge branch 'main' into opinionated-reconciler-logging-tracing-logic…

…-fixes
grafana · Jan 3, 2025 · 01ee991 · 01ee991
2 parents 6661c8c + 62673a0
commit 01ee991
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -15,10 +15,11 @@ on:
       - '**.go'
 permissions:
   contents: write
+  id-token: write
 jobs:
   update:
     runs-on: "ubuntu-latest"
-    if: ${{ github.actor == 'dependabot[bot]' }}
+    if: ${{ github.actor == 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository }}
     continue-on-error: true
     steps:
     - name: Retrieve GitHub App secrets
@@ -51,8 +52,8 @@ jobs:
 
     - name: Configure Git
       run: |
-          git config --local user.email "${APP_INSTALLATION_ID}+grafana-go-workspace-bot[bot]@users.noreply.github.com"
-          git config --local user.name "grafana-go-workspace-bot[bot]"
+          git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
           git config --local --add --bool push.autoSetupRemote true
 
     - name: Update workspace