From b259381e7c09fa638345d515f4877e8e5c34ce41 Mon Sep 17 00:00:00 2001 From: Adam Bannach Date: Fri, 29 Jul 2022 15:33:35 -0500 Subject: [PATCH 1/2] chore(gha): add version bumping to pluginsdk-peerdeps --- .github/workflows/package-bump-pr.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package-bump-pr.yml b/.github/workflows/package-bump-pr.yml index c719692eb77..e93e40e5cd3 100644 --- a/.github/workflows/package-bump-pr.yml +++ b/.github/workflows/package-bump-pr.yml @@ -51,12 +51,25 @@ jobs: - name: lerna - Bump packages run: | + # bump versions of packages npx lerna version --yes --no-push --conventional-commits if [[ $(git rev-list --count @{u}..HEAD) -ne 0 ]] ; then + # Synchronize @spinnaker/pluginsdk-peerdeps + cd packages/pluginsdk-peerdeps + yarn sync + # navigate back to root + cd ../.. + + # bump version of @spinnaker/pluginsdk-peerdeps but don't commit changes + npx lerna version --yes --no-push --conventional-commits --no-git-tag-version + git add packages/pluginsdk-peerdeps + + # Update yarn.lock yarn git add yarn.lock - # Update yarn.lock and fix the lerna commit message (to use conventional commits itself) - git commit --amend -m "$(git log -1 --pretty=%B | sed -e 's/^Publish/chore(publish): publish packages/')" yarn.lock + + # Amend yarn.lock and @spinnaker/pluginsdk-peerdeps to original lerna commit message using conventional commits + git commit --amend -m "$(git log -1 --pretty=%B | sed -e 's/^Publish/chore(publish): publish packages/')" fi - name: gha - get bumped packages From ff3f7c5429c402fd0394984aaf719d5f26a7a541 Mon Sep 17 00:00:00 2001 From: Adam Bannach Date: Fri, 29 Jul 2022 16:30:28 -0500 Subject: [PATCH 2/2] chore(gha): commit sync before bumping version --- .github/workflows/package-bump-pr.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/package-bump-pr.yml b/.github/workflows/package-bump-pr.yml index e93e40e5cd3..6b7ad9f5146 100644 --- a/.github/workflows/package-bump-pr.yml +++ b/.github/workflows/package-bump-pr.yml @@ -52,24 +52,24 @@ jobs: - name: lerna - Bump packages run: | # bump versions of packages - npx lerna version --yes --no-push --conventional-commits + npx lerna version --yes --no-push --conventional-commits -m "chore(publish): publish packages" if [[ $(git rev-list --count @{u}..HEAD) -ne 0 ]] ; then # Synchronize @spinnaker/pluginsdk-peerdeps cd packages/pluginsdk-peerdeps yarn sync + # navigate back to root cd ../.. - # bump version of @spinnaker/pluginsdk-peerdeps but don't commit changes - npx lerna version --yes --no-push --conventional-commits --no-git-tag-version - git add packages/pluginsdk-peerdeps - - # Update yarn.lock + # perform any updates to yarn.lock yarn - git add yarn.lock - # Amend yarn.lock and @spinnaker/pluginsdk-peerdeps to original lerna commit message using conventional commits - git commit --amend -m "$(git log -1 --pretty=%B | sed -e 's/^Publish/chore(publish): publish packages/')" + # commit changes + git add yarn.lock packages/pluginsdk-peerdeps + git commit -m "feat(peerdep-sync): Synchronize peerdependencies" + + # bump version of @spinnaker/pluginsdk-peerdeps + npx lerna version --yes --no-push --conventional-commits -m "chore(publish): publish packages" fi - name: gha - get bumped packages