fix push to main after version update

Author: geoffhouse

.github/workflows/deploy.yml

@@ -19,6 +19,7 @@ permissions:
     actions: read
     contents: read
     packages: write
+    pull-requests: read
 
 jobs:
     verify-version-job:
@@ -44,6 +45,21 @@ jobs:
                         return;
                       }
 
+                      const changelogPullRequests = await github.paginate(github.rest.pulls.list, {
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        state: "open",
+                        base: "main",
+                        head: `${context.repo.owner}:ci/update-changelogs`,
+                        per_page: 100,
+                      });
+
+                      if (changelogPullRequests.length > 0) {
+                        core.info("A changelog pull request is open; skipping deploy until it is merged.");
+                        core.setOutput("should_deploy", "false");
+                        return;
+                      }
+
                       const jobs = await github.paginate(github.rest.actions.listJobsForWorkflowRun, {
                         owner: context.repo.owner,
                         repo: context.repo.repo,

.github/workflows/versioning.yml

@@ -116,24 +116,27 @@ jobs:
             - name: update module changelogs
               run: node .github/scripts/updateModules.js
 
-            - name: commit changelog/module changes
-              run: |
-                  git config user.name "github-actions[bot]"
-                  git config user.email "github-actions[bot]@users.noreply.github.com"
-                  git add src/modules
-                  git diff --cached --quiet || git commit -m "ci: update module changelogs and bump versions"
-                  git push
-
             - name: update app changelogs
               run: node .github/scripts/updateApp.js
 
-            - name: commit changelog/app changes
-              run: |
-                  git config user.name "github-actions[bot]"
-                  git config user.email "github-actions[bot]@users.noreply.github.com"
-                  git add CHANGELOG.md package.json src/client/package.json
-                  git diff --cached --quiet || git commit -m "ci: update app changelog and bump versions"
-                  git push
+            - name: create changelog pull request
+              uses: peter-evans/create-pull-request@v7
+              with:
+                  token: ${{ secrets.GITHUB_TOKEN }}
+                  base: main
+                  branch: ci/update-changelogs
+                  delete-branch: true
+                  add-paths: |
+                      src/modules
+                      CHANGELOG.md
+                      package.json
+                      src/client/package.json
+                  commit-message: "ci: update changelogs and bump versions"
+                  title: "ci: update changelogs and bump versions"
+                  body: |
+                      This pull request contains the generated module and app changelog updates.
+
+                      It was created automatically after the required test workflows completed successfully.
 
     slack-finish:
         name: Slack final status