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

chore(ci): reuse changelog workflow #11549

Merged
merged 3 commits into from
Sep 20, 2023
Merged

chore(ci): reuse changelog workflow #11549

merged 3 commits into from
Sep 20, 2023

Conversation

vm-001
Copy link
Contributor

@vm-001 vm-001 commented Sep 12, 2023

Summary

To avoid redundant work, I moved all the changelog tools to a separate repo gateway-changelog. All the release branches can reuse the shared GitHub action to validate the changelog schema.

changelogs:

  • remove changelog generation tool

@vm-001 vm-001 marked this pull request as draft September 12, 2023 07:44
@github-actions github-actions bot added the chore Not part of the core functionality of kong, but still needed label Sep 12, 2023
@vm-001 vm-001 force-pushed the ci/resuse-changelog-workflow branch from 75fd656 to a8a53fb Compare September 12, 2023 08:31
@pull-request-size pull-request-size bot added size/L and removed size/M labels Sep 12, 2023
@vm-001 vm-001 force-pushed the ci/resuse-changelog-workflow branch from a8a53fb to c5f58fc Compare September 12, 2023 08:32
@vm-001 vm-001 force-pushed the ci/resuse-changelog-workflow branch from c5f58fc to 719da3d Compare September 12, 2023 08:52
@vm-001 vm-001 force-pushed the ci/resuse-changelog-workflow branch 5 times, most recently from 14bcbc1 to 8ab107a Compare September 13, 2023 08:29
@vm-001 vm-001 marked this pull request as ready for review September 13, 2023 09:56
@vm-001 vm-001 requested a review from dndx September 13, 2023 09:56
@kikito
Copy link
Member

kikito commented Sep 19, 2023

@vm-001 is this up to date? It seems we have done more changes to the changelog process

@vm-001 vm-001 force-pushed the ci/resuse-changelog-workflow branch 3 times, most recently from b476a1a to 592f161 Compare September 19, 2023 09:12
@vm-001
Copy link
Contributor Author

vm-001 commented Sep 19, 2023

@vm-001 is this up to date? It seems we have done more changes to the changelog process

Yes, this one is up to date. Need the relying one be merged first: https://github.com/Kong/gateway-changelog/pulls

@vm-001 vm-001 force-pushed the ci/resuse-changelog-workflow branch from 592f161 to ba4918e Compare September 19, 2023 09:31
@dndx dndx force-pushed the ci/resuse-changelog-workflow branch from e05d9ae to 46d9216 Compare September 19, 2023 10:18
@vm-001 vm-001 force-pushed the ci/resuse-changelog-workflow branch from 46d9216 to 727258a Compare September 19, 2023 13:29
@vm-001 vm-001 force-pushed the ci/resuse-changelog-workflow branch from 727258a to 2df56d0 Compare September 20, 2023 02:23
@dndx dndx merged commit 710489f into master Sep 20, 2023
22 checks passed
@dndx dndx deleted the ci/resuse-changelog-workflow branch September 20, 2023 09:14
@team-gateway-bot
Copy link
Collaborator

The backport to release/3.2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.2.x release/3.2.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.2.x
# Create a new branch
git switch --create backport-11549-to-release/3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 710489f2d4cdbebf0fa8c9b9f8e2d8e38e749cad
# Push it to GitHub
git push --set-upstream origin backport-11549-to-release/3.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.2.x

Then, create a pull request where the base branch is release/3.2.x and the compare/head branch is backport-11549-to-release/3.2.x.

@team-gateway-bot
Copy link
Collaborator

The backport to release/3.3.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.3.x release/3.3.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.3.x
# Create a new branch
git switch --create backport-11549-to-release/3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 710489f2d4cdbebf0fa8c9b9f8e2d8e38e749cad
# Push it to GitHub
git push --set-upstream origin backport-11549-to-release/3.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.3.x

Then, create a pull request where the base branch is release/3.3.x and the compare/head branch is backport-11549-to-release/3.3.x.

@team-gateway-bot
Copy link
Collaborator

The backport to release/3.4.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.4.x release/3.4.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.4.x
# Create a new branch
git switch --create backport-11549-to-release/3.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 710489f2d4cdbebf0fa8c9b9f8e2d8e38e749cad
# Push it to GitHub
git push --set-upstream origin backport-11549-to-release/3.4.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.4.x

Then, create a pull request where the base branch is release/3.4.x and the compare/head branch is backport-11549-to-release/3.4.x.

hanshuebner pushed a commit that referenced this pull request Sep 27, 2023
This avoids code duplication and makes improvements on changelog generation/format easier.
dndx added a commit that referenced this pull request Sep 27, 2023
…11668)

* chore(changelog): use reusable changelog workflow (#11549)

This avoids code duplication and makes improvements on changelog generation/format easier.

* chore(changelog): use simpler format for changelog files with the new (#11652)

changelog generator

The new changelog generator removes the need to write down jiras or prs manually. Now these are automatically extracted by the script and these fields are no longer needed.

Also, we changed the file extension to .yml to stay consistent with the rest of the repository.

Existing changelogs were modified automatically using yq to remove these fields that are no longer needed. This will be eventually backported to all branches that currently uses the new changelog generator.

KAG-2545

---------

Co-authored-by: Yusheng Li <[email protected]>
Co-authored-by: Datong Sun <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Not part of the core functionality of kong, but still needed core/docs size/XL skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants