fix: Add dependency for update job completion before Bors merges (#43)

The changelog and msrv updates got missed in the last PR, bc the job hadn't completed yet but `done` wasn't configured to wait.

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: tjtelan

.github/workflows/ci.yml

@@ -104,7 +104,7 @@ jobs:
   #        default_author: github_actions
   #        message: "[skip ci] Update CHANGELOG from Github Actions"
 
-  update_project_stuff:
+  update-project-stuff:
     uses: ./.github/workflows/update-repo-stuff.yml
     secrets: inherit
 
@@ -113,7 +113,7 @@ jobs:
     if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
     needs:
       - ci
-      #- commit_changelog
+      - update-project-stuff
     runs-on: ubuntu-latest
     steps:
       - name: Done

.github/workflows/update-repo-stuff.yml

@@ -6,7 +6,7 @@ on:
 env:
   CHANGELOG_FILENAME: CHANGELOG.md
   DEFAULT_BRANCH: main
-  ADD_PR_LABELS: bot
+  ADD_PR_LABELS: bot-updated
   RESTART_PR_DELAY: 15s
   GIT_BOT_USERNAME: github-actions[bot]
   GIT_BOT_EMAIL: github-actions[bot]@users.noreply.github.com
@@ -197,6 +197,9 @@ jobs:
           path: ${{ env.CHANGELOG_FILENAME }}
           retention-days: 1
 
+  # In the future, we should find a way to skip this step for the final build
+  # after msrv and changelog have been updated
+  # possibly using labels on PR
   generate_msrv:
     name: Generate Minimum Supported Rust Version badge
     if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
@@ -257,11 +260,11 @@ jobs:
           name: ${{ env.CHANGELOG_FILENAME }}
           path: .
 
-      - name: Download ${{ env.CHANGELOG_FILENAME }}
+      - name: Download msrv-badge.svg
         uses: actions/download-artifact@v2
         with:
           name: msrv-badge.svg
-          path: .
+          path: .github/assets
 
       #- name: Check repo
       #  run: |
@@ -272,16 +275,19 @@ jobs:
         id: auto-commit-action
         uses: stefanzweifel/git-auto-commit-action@v4.14.1
         with:
-          commit_message: "Updating ${{ env.CHANGELOG_FILENAME }} [actions skip]"
+          commit_message: "Updating ${{ env.CHANGELOG_FILENAME }} and/or MSRV badge [actions skip]"
           commit_user_name: ${{ env.GIT_BOT_USERNAME }}
           commit_user_email: ${{ env.GIT_BOT_EMAIL }}
           commit_author: ${{ env.GIT_BOT_USERNAME }} <${{ env.GIT_BOT_EMAIL }}>
 
+      # Make sure labels are created first
       - name: Wait, then restart Bors and label PR
         if: ${{ steps.auto-commit-action.outputs.changes_detected == 'true' }}
         env:
           GH_TOKEN: ${{ steps.app.outputs.token }}
         run: |
+
+          printf "Changelog and/or MSRV badge was updated.\n\nBors will cancel job, but no action is required. Job will be restarted." | gh pr comment ${{ needs.get_pr_info.outputs.pr_number }} --body-file -
           sleep ${{ env.RESTART_PR_DELAY }}
           gh pr edit ${{ needs.get_pr_info.outputs.pr_number }} --add-label ${{ env.ADD_PR_LABELS }}
           printf "Updated changelog before staging build.\nbors r+" | gh pr comment ${{ needs.get_pr_info.outputs.pr_number }} --body-file -

CHANGELOG.md

@@ -12,13 +12,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add short git URL notation support ([#28](https://github.com/tjtelan/git-url-parse-rs/issues/28))
 - Add MSRV badge ([#36](https://github.com/tjtelan/git-url-parse-rs/issues/36))
 - Add personal access token to checkout ([#41](https://github.com/tjtelan/git-url-parse-rs/issues/41))
+- Add pre-merge generated updates ([#42](https://github.com/tjtelan/git-url-parse-rs/issues/42))
 
 ### Fixed
 
 - Update CHANGELOG from Github Actions
 - Make changelog update fixup to PR commit ([#33](https://github.com/tjtelan/git-url-parse-rs/issues/33))
 - Fix post pr workflow ([#37](https://github.com/tjtelan/git-url-parse-rs/issues/37))
 - Post PR: Include all PR files with changelog commit with `--all` ([#38](https://github.com/tjtelan/git-url-parse-rs/issues/38))
+- Add dependency for update job completion before Bors merges ([#43](https://github.com/tjtelan/git-url-parse-rs/issues/43))
 
 ### Other
 

Cargo.toml

@@ -4,7 +4,7 @@ categories = ["parser-implementations", "encoding"]
 description = "A parser for git repo urls based on url crate"
 documentation = "https://docs.rs/git-url-parse"
 edition = "2021"
-keywords = ["git", "url", "parsing"]
+keywords = ["git", "url", "parsing", "normalize"]
 license = "MIT"
 name = "git-url-parse"
 readme = "README.md"