Modify weekly pulumi upgrade action to run acceptance tests and auto-…

…merge
pulumi · Jun 17, 2024 · 8d43339 · 8d43339
1 parent 5673b22
commit 8d43339
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml
@@ -13,7 +13,9 @@ jobs:
         with:
           token: ${{ secrets.PULUMI_BOT_TOKEN }}
           reaction-token: ${{ secrets.GITHUB_TOKEN }}
-          commands: run-acceptance-tests
+          commands: |
+            run-acceptance-tests
+            run-pulumi-update
           permission: write
           issue-type: pull-request
           repository: pulumi/pulumi-awsx
diff --git a/.github/workflows/weekly-pulumi-update.yml b/.github/workflows/weekly-pulumi-update.yml
@@ -1,5 +1,7 @@
 name: weekly-pulumi-update
 on:
+  repository_dispatch:
+    types: [run-pulumi-update-command]
   schedule:
   # Every Monday at 11AM UTC
   - cron: 0 11 * * 1
@@ -85,8 +87,13 @@ jobs:
     - name: pull-request
       if: steps.gomod.outputs.changes != 0
       env:
-        GH_TOKEN: ${{ github.token }}
+        GH_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
       run: |
         gh pr create --title "Update pulumi/pulumi version to $PULUMI_VERSION" --body "Upgrading pulumi/pkg and pulumi/sdk to version $PULUMI_VERSION."
-        gh pr merge --auto
+    - name: Enable auto-merge
+      if: steps.gomod.outputs.changes != 0 && github.event_name == 'schedule'
+      env:
+        GH_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }}
+      run: |
+        gh pr merge --merge --auto "1"
     name: weekly-pulumi-update