Merge branch 'master' into mzibrick-ccxdev14404-insh_droid

InsightsDroid · Oct 17, 2024 · d4e743a · d4e743a
2 parents 1db62bc + 4c79da4
commit d4e743a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/.github/workflows/bots-automerge.yml b/.github/workflows/bots-automerge.yml
@@ -3,38 +3,32 @@ name: Bots auto-merge
 on: pull_request
 
 # This section adds write permissions to the secrets.GITHUB_TOKEN. Default is just read
-#permissions:
-  #contents: write
-  #pull-requests: write
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   bot-automerge:
     runs-on: ubuntu-latest
-    permissions: write-all
     # Check the pull request author.
     if: |
       github.event.pull_request.user.login == 'dependabot[bot]' ||
       github.event.pull_request.user.login == 'red-hat-konflux[bot]' ||
       github.event.pull_request.user.login == 'InsightsDroid'
     steps:
-      - run: gh auth status
-        env:
-            GH_TOKEN: ${{ github.token }}
-      - run: echo "$PR_URL"
-        env:
-            PR_URL: ${{github.event.pull_request.html_url}}
+      # NOTE: PR approval does not work on PRs from forks
       - name: Github Actions bot approves the PR
         run: gh pr review --approve "$PR_URL"
         env:
-            PR_URL: ${{github.event.pull_request.html_url}}
-            GH_TOKEN: ${{ github.token }}
-      # - name: InsightsDroid approves the PR
-      #   run: gh pr review --approve "$PR_URL"
-      #   env:
-      #     PR_URL: ${{github.event.pull_request.html_url}}
-      #     GH_TOKEN: ${{secrets.INSIGHTSDROID_TOKEN}}
-      # - name: Enable auto-merge for Dependabot PRs
-      #   run: gh pr merge --auto --merge "$PR_URL"
-      #   env:
-      #     PR_URL: ${{github.event.pull_request.html_url}}
-      #     GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{ github.token }}
+      - name: InsightsDroid approves the PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.INSIGHTSDROID_TOKEN}}
+      - name: Enable auto-merge for PR
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{ github.token }}
diff --git a/requirements.txt b/requirements.txt
@@ -3,5 +3,5 @@
 app-common-python==0.2.7
 ccx-messaging @ git+https://github.com/RedHatInsights/[email protected]
 insights-core-messaging @ git+https://github.com/RedHatInsights/[email protected]
-ccx-rules-ocp==2024.09.25
+ccx-rules-ocp==2024.10.16
 setuptools>=70.0.0