CI: commit directly to repo and create/update issue on failures

Botspot · Jan 28, 2024 · 6cfc105 · 6cfc105
1 parent d7792d7
commit 6cfc105
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 24 deletions.
diff --git a/.github/update_apps_issue_template.md b/.github/update_apps_issue_template.md
@@ -0,0 +1,12 @@
+---
+title: 'CI: Update App Versions Failures'
+---
+[badge-error]: https://github.com/Pi-Apps-Coders/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/error.svg?raw=true 'Error'
+[badge-warning]: https://github.com/Pi-Apps-Coders/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/warning.svg?raw=true 'Warning'
+[badge-issue]: https://github.com/Pi-Apps-Coders/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/issue.svg?raw=true 'Issue'
+[badge-check]: https://github.com/Pi-Apps-Coders/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/check.svg?raw=true 'Check'
+[badge-info]: https://github.com/Pi-Apps-Coders/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/info.svg?raw=true 'Info'
+Workflow run: https://github.com/{{ env.GITHUB_REPOSITORY }}/actions/runs/{{ env.GITHUB_RUN_ID }}
+
+{{ env.FAILED_APPS }}
+{{ env.ALL_FAILED_APPS_ERROR_STRING }}
diff --git a/.github/workflows/update_apps.yml b/.github/workflows/update_apps.yml
@@ -301,10 +301,12 @@ jobs:
           echo "${{env.UPDATED_APPS}}" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-  create-pr:
+  create-commit:
     needs: [get-latest-app-versions,test-updated-apps]
     runs-on: ubuntu-latest
     steps:
+      # setup github environment variables
+      - uses: actions/checkout@v3
       # restore GITHUB_WORKSPACE
       - uses: actions/download-artifact@v3
         with:
@@ -313,7 +315,7 @@ jobs:
       - name: Extract GITHUB_WORKSPACE
         run: |
           cd ${{ runner.temp }}
-          tar xf GITHUB_WORKSPACE.tar -C $GITHUB_WORKSPACE
+          tar xf GITHUB_WORKSPACE.tar -C $GITHUB_WORKSPACE --exclude=".git"
           cd $GITHUB_WORKSPACE
       - name: Delete artifact
         uses: geekyeggo/delete-artifact@v2
@@ -349,7 +351,6 @@ jobs:
 
             error_string+="reverting to previous version."$'\n'$'\n'
           done
-          true
           echo "ALL_FAILED_APPS_ERROR_STRING<<EOF" >> $GITHUB_ENV
           echo "$error_string" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
@@ -371,28 +372,25 @@ jobs:
           echo "$ALL_UPDATED_APPS" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
 
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+      - name: Create Commit and Push
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
-          commit-message: |
+          commit_author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          commit_message: |
             Update App Versions, run by GitHub Actions - Apps updated:
 
             ${{ env.ALL_UPDATED_APPS }}
-          branch: "auto-app-updates-NOT-FOR-USERS"
-          title: "[AUTO] Update App Versions"
-          body: |
-            [badge-error]: https://github.com/Pi-Apps-Coders/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/error.svg?raw=true 'Error'
-            [badge-warning]: https://github.com/Pi-Apps-Coders/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/warning.svg?raw=true 'Warning'
-            [badge-issue]: https://github.com/Pi-Apps-Coders/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/issue.svg?raw=true 'Issue'
-            [badge-check]: https://github.com/Pi-Apps-Coders/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/check.svg?raw=true 'Check'
-            [badge-info]: https://github.com/Pi-Apps-Coders/GitHub-Markdown/blob/main/blockquotes/badge/dark-theme/info.svg?raw=true 'Info'
-            Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action.
-            Workflow run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-            For the cleanest looking merge remember to use the "Rebase and merge" option.
-            Apps updated:
-            ```
-            ${{ env.ALL_UPDATED_APPS }}
-            ```
-            ${{needs.get-latest-app-versions.outputs.FAILED_APPS}}
-            ${{ env.ALL_FAILED_APPS_ERROR_STRING }}
+
+      - name: Create or Update issue
+        if: ${{ needs.get-latest-app-versions.outputs.FAILED_APPS != '' || env.ALL_FAILED_APPS_ERROR_STRING != '' }}
+        uses: JasonEtco/create-an-issue@v2
+        env:
+          FAILED_APPS: ${{needs.get-latest-app-versions.outputs.FAILED_APPS}}
+          ALL_FAILED_APPS_ERROR_STRING: ${{ env.ALL_FAILED_APPS_ERROR_STRING }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_RUN_ID: ${{ github.run_id }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          update_existing: true
+          search_existing: all
+          filename: .github/update_apps_issue_template.md