Fix new generate-docs-helm-tests-renovate-pr (#10793)

* Testing new generate-docs-helm-tests-renovate-pr * Remove one line to test * Fix workflow to enable testing * Add vault_instance * Check if secrets are here * Keep testing * Keep testing * Keep testing * Keep testing * Keep testing * Keep testing * Update build with regenerated helm tests and docs * Simplify changes * Still testing * Update build with regenerated helm tests and docs * Re-add renovabot limitation * Add comment --------- Co-authored-by: armandgrillet <[email protected]>
grafana · Mar 5, 2025 · e69bb95 · e69bb95
1 parent 2c4b90c
commit e69bb95
Showing 1 changed file with 22 additions and 16 deletions.
diff --git a/.github/workflows/generate-docs-helm-tests-renovate-pr.yml b/.github/workflows/generate-docs-helm-tests-renovate-pr.yml
@@ -26,6 +26,19 @@ jobs:
       - name: Get build image from Makefile
         id: build_image_step
         run: echo "build_image=$(make print-build-image)" >> "$GITHUB_OUTPUT"
+    outputs:
+      build_image: ${{ steps.build_image_step.outputs.build_image }}
+
+  lint_and_update:
+    runs-on: ubuntu-latest
+    needs:
+      - prepare
+    container:
+      image: ${{ needs.prepare.outputs.build_image }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
       # Retrieve GitHub App Credentials from Vault
       - name: Retrieve GitHub App Credentials from Vault
         id: get-secrets
@@ -34,28 +47,21 @@ jobs:
           repo_secrets: |
             APP_ID=mimir-github-bot:app_id
             PRIVATE_KEY=mimir-github-bot:private_key
-      # Generate GitHub App Token
+
+      # Generate GitHub App Token (Directly in the Job That Needs It)
       - name: Generate GitHub App Token
-        id: app-token
+        id: token
         uses: actions/create-github-app-token@v1
         with:
-          app-id: ${{ steps.get-secrets.outputs.APP_ID }}
-          private-key: ${{ steps.get-secrets.outputs.PRIVATE_KEY }}
+          # Variables generated by the previous step get-secrets
+          app-id: ${{ env.APP_ID }}
+          private-key: ${{ env.PRIVATE_KEY }}
           owner: ${{ github.repository_owner }}
-    outputs:
-      build_image: ${{ steps.build_image_step.outputs.build_image }}
 
-  lint_and_update:
-    runs-on: ubuntu-latest
-    needs:
-      - prepare
-    container:
-      image: ${{ needs.prepare.outputs.build_image }}
-    steps:
-      - name: Checkout Repository
+      - name: Checkout Repository with App Token
         uses: actions/checkout@v4
         with:
-          token: ${{ steps.app-token.outputs.token }}
+          token: ${{ steps.token.outputs.token }}
 
       - name: Run Git Config
         run: |
@@ -69,7 +75,7 @@ jobs:
       - name: Checkout Pull Request Branch
         run: gh pr checkout ${{ github.event.pull_request.number }}
         env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.token.outputs.token }}
 
       - name: Run make targets
         id: update