Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix changelog automation #1413

Merged
merged 2 commits into from
May 16, 2024
Merged

Fix changelog automation #1413

merged 2 commits into from
May 16, 2024

Conversation

adamziel
Copy link
Collaborator

The changelog-generating job wasn't running lately. This PR connects it to Release NPM packages workflow success and fixes a few subtle bugs.

Testing instructions

  • Run npm run changelog locally and confirm it worked
  • That's about it :( We'll need to wait until the next package release to confirm it worked.

The changelog-generating job wasn't running lately. This PR connects it
to Release NPM packages workflow success and fixes a few subtle bugs.

 ## Testing instructions

* Run `npm run changelog` locally and confirm it worked
* That's about it :( We'll need to wait until the next package release
  to confirm it worked.
@adamziel adamziel added [Type] Bug An existing feature does not function as intended [Type] Repo / Project Management labels May 16, 2024
@adamziel adamziel requested a review from a team as a code owner May 16, 2024 12:03
@adamziel adamziel merged commit 00f9577 into trunk May 16, 2024
5 checks passed
@adamziel adamziel deleted the fix-auto-changelog branch May 16, 2024 14:08
@brandonpayton
Copy link
Member

brandonpayton commented May 21, 2024

Unfortunately, it looks like the changelog update workflow failed this morning:
https://github.com/WordPress/wordpress-playground/actions/runs/9177933181/job/25236668463#step:6:18

This appears to be because the workflow does not commit the changes to packages/docs/site/docs/17-changelog.md.

% bun packages/docs/site/bin/refresh-changelog.ts
Changelog copied and frontmatter prepended successfully!

% git status
...
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   CHANGELOG.md
        modified:   packages/docs/site/docs/17-changelog.md

We only commit one of the changed files:

if [[ -n $(git status --porcelain CHANGELOG.md) ]]; then
      git commit CHANGELOG.md -m "chore: update changelog"
      git pull origin trunk --rebase
      git push origin trunk
  else

which leads to the error:

[trunk 33278bf] chore: update changelog
 1 file changed, 1 insertion(+), 82 deletions(-)
error: cannot pull with rebase: You have unstaged changes.
error: Please commit or stash them.
Error: Process completed with exit code 128.

@brandonpayton
Copy link
Member

Working on a fix for this.

@brandonpayton
Copy link
Member

PR here: #1449

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Type] Bug An existing feature does not function as intended [Type] Repo / Project Management
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants