From a361d18bb1adc1dc15c503b50f71f4e11877c62b Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:10:04 -0600 Subject: [PATCH 01/95] fix: implement semantic release with workflows and releaserc config Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 156 ++++++++++++++++++ .../increment-next-main-release.yaml | 116 +++++++++++++ .releaserc | 32 ++++ 3 files changed, 304 insertions(+) create mode 100644 .github/workflows/flow-trigger-release.yaml create mode 100644 .github/workflows/increment-next-main-release.yaml create mode 100644 .releaserc diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml new file mode 100644 index 000000000000..afc1d3d30fd4 --- /dev/null +++ b/.github/workflows/flow-trigger-release.yaml @@ -0,0 +1,156 @@ +## +# Copyright (C) 2025 Hedera Hashgraph, LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +## + +name: "[Main] Create New Release" +on: + workflow_dispatch: + inputs: + build_number: + description: "Build Number (ex: 43 = build_00043)" + type: string + required: true + dry-run-enabled: + description: "Perform Dry Run" + type: boolean + required: false + default: false + +defaults: + run: + shell: bash + +permissions: + id-token: write + contents: read + actions: read + +jobs: + create-new-release: + name: Create New Release + runs-on: network-node-linux-medium + steps: + - name: Harden Runner + uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2 + with: + egress-policy: audit + + - name: Process, Validate, and Pad Build Input + id: validate + run: | + echo "The input is ${{ inputs.build_number }}" + if ! [[ "${{ inputs.build_number }}" =~ ^[0-9]+$ ]]; then + echo "Input is not a valid integer" + exit 1 + fi + echo "Input is a valid integer: $(( ${{ inputs.build_number }} ))" + + # 5-digit padding + padded_number=$(printf "%05d" ${{ inputs.build_number }}) + echo "Padded number is: $padded_number" + + # Add "build_" prefix to the padded number + build_tag="build-$padded_number" + echo "Prefixed number is: $build_tag" + + # Export to Github output + echo "BUILD_TAG=$build_tag" >> $GITHUB_OUTPUT + + - name: Checkout Code + id: checkout_code + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + fetch-depth: "0" + ref: ${{ steps.validate.outputs.BUILD_TAG }} + token: ${{ secrets.GH_ACCESS_TOKEN }} + + - name: Checkout Code + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + path: "private" + ref: "14967-semantic-release-workflow-update" + + - name: Copy Private .releaserc file to Github Workspace + run: cp -f private/.releaserc .releaserc + + - name: Display Current Branch or Tag + run: | + # Check if it's a tag + if git describe --exact-match --tags >/dev/null 2>&1; then + echo "Checked out tag: $(git describe --exact-match --tags)" + else + echo "Checked out branch: $(git symbolic-ref --short HEAD)" + fi + + - name: Import GPG Key + uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 + with: + git_commit_gpgsign: true + git_tag_gpgsign: true + git_user_signingkey: true + gpg_private_key: ${{ secrets.SVCS_GPG_KEY_CONTENTS }} + passphrase: ${{ secrets.SVCS_GPG_KEY_PASSPHRASE }} + + - name: Setup Node + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 + with: + node-version: 20 + + - name: Install Dependencies + run: | + echo "Installing semantic-release" + npm install -g semantic-release@24.2.0 @semantic-release/git@10.0.1 @semantic-release/github@11.0.1 \ + @semantic-release/exec@6.0.3 semantic-release-helm3@2.9.3 \ + conventional-changelog-conventionalcommits@8.0.0 \ + @commitlint/cli@19.5.0 @commitlint/config-conventional@19.5.0 \ + marked-mangle@1.1.10 marked-gfm-heading-id@4.1.1 semantic-release-conventional-commits@3.0.0 + + - name: Calculate Temporary Semantic Release Branch Name + id: branch_name + run: | + echo "BRANCH_NAME=temp/${{ steps.validate.outputs.BUILD_TAG }}" >> $GITHUB_OUTPUT + + - name: Create a Temporary Semantic Release Branch + run: | + echo "Going to run the following command:" + echo "git checkout -b ${{ steps.branch_name.outputs.BRANCH_NAME }}" + git checkout -b ${{ steps.branch_name.outputs.BRANCH_NAME }} + + echo "Checked out to:" + echo git status + + echo "Pushing branch to origin:" + git push --set-upstream origin ${{ steps.branch_name.outputs.BRANCH_NAME }} + + - name: Publish Semantic Release + env: + GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} + GIT_AUTHOR_NAME: ${{ secrets.GIT_USER_NAME }} + GIT_AUTHOR_EMAIL: ${{ secrets.GIT_USER_EMAIL }} + GIT_COMMITTER_NAME: ${{ secrets.GIT_USER_NAME }} + GIT_COMMITTER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} + run: | + ARGS="" + if [[ "${{ github.event.inputs.dry-run-enabled }}" == true ]]; then + ARGS="--dry-run" + fi + npx semantic-release ${ARGS} + + - name: Delete the Temporary Semantic Release Branch + if: always() + run: | + echo "Deleting the temporary semantic release branch" + git branch -d ${{ steps.branch_name.outputs.BRANCH_NAME }} + git push -d origin ${{ steps.branch_name.outputs.BRANCH_NAME }} diff --git a/.github/workflows/increment-next-main-release.yaml b/.github/workflows/increment-next-main-release.yaml new file mode 100644 index 000000000000..6420d78da53b --- /dev/null +++ b/.github/workflows/increment-next-main-release.yaml @@ -0,0 +1,116 @@ +## +# Copyright (C) 2025 Hedera Hashgraph, LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +## + +name: "[Main] Prepare Next Release Version" +on: + workflow_dispatch: + +defaults: + run: + shell: bash + +permissions: + id-token: write + contents: write + actions: write + issues: write + +jobs: + next-main-release: + name: Prepare Next Release Version + runs-on: network-node-linux-medium + steps: + - name: Harden Runner + uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2 + with: + egress-policy: audit + + - name: Setup Node + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 + with: + node-version: 20 + + - name: Checkout Code + id: checkout_code + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + fetch-depth: "0" + ref: main + token: ${{ secrets.GH_ACCESS_TOKEN }} + + - name: Import GPG Key + id: gpg_importer + uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 + with: + git_commit_gpgsign: true + git_tag_gpgsign: true + git_user_signingkey: true + gpg_private_key: ${{ secrets.SVCS_GPG_KEY_CONTENTS }} + passphrase: ${{ secrets.SVCS_GPG_KEY_PASSPHRASE }} + + - name: Install Semantic Version Tools + id: install_semver + run: | + echo "::group::Download SemVer Binary" + sudo curl -L -o /usr/local/bin/semver https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver + echo "::endgroup::" + echo "::group::Change SemVer Binary Permissions" + sudo chmod -v +x /usr/local/bin/semver + echo "::endgroup::" + echo "::group::Show SemVer Binary Version Info" + semver --version + echo "::endgroup::" + + - name: Read Current Version + id: read_version + run: | + current_version=$(cat version.txt) + echo "Current version: ${current_version}" + echo "version=${current_version}" >> ${GITHUB_OUTPUT} + printf "Current Version: ${current_version}" >> ${GITHUB_STEP_SUMMARY} + + - name: Increment Minor Version + id: increment_version + run: | + # Strip the -SNAPSHOT suffix + base_version=$(semver get release ${{ steps.read_version.outputs.version }}) + + # Increment the minor version + new_version=$(semver bump minor ${base_version}) + + # Add the -SNAPSHOT suffix back + new_version="${new_version}-SNAPSHOT" + + echo "New version: ${new_version}" + echo "new_version=${new_version}" >> ${GITHUB_OUTPUT} + printf "New Version: ${new_version}" >> ${GITHUB_STEP_SUMMARY} + + - name: Update version.txt + run: | + echo ${{ steps.increment_version.outputs.new_version }} > version.txt + + - name: Publish to Maven Central + run: | + ./gradlew versionAsSpecified -PnewVersion=${{ steps.increment_version.outputs.new_version }} + + - name: Add & Commit + uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4 + with: + cwd: "." + author_name: ${{ secrets.SVCS_GIT_USER_NAME }} + author_email: ${{ secrets.SVCS_GIT_USER_EMAIL }} + commit: --signoff + message: "chore: Minor Version Roll" diff --git a/.releaserc b/.releaserc new file mode 100644 index 000000000000..c433f1eda1bd --- /dev/null +++ b/.releaserc @@ -0,0 +1,32 @@ +{ + "releaseRules": [ + { "breaking": "true", "release": "minor"} + ], + "plugins": [ + "@semantic-release/commit-analyzer", + [ + "@semantic-release/release-notes-generator", + { + "preset": "conventionalcommits" + } + ], + "@semantic-release/git", + "@semantic-release/github" + ], + "branches":[ + { + "name": "14967-clean-semantic-release-workflow" + }, + { + "name": "main" + }, + { + "name": "temp/build-*" + }, + { + "name": "release/([0-9]+).([0-9]+)", + "channel": "${name.replace(/release\\//g, '').split('.')[0]}.${name.replace(/release\\//g, '').split('.')[1]}.x", + "range": "${name.replace(/release\\//g, '').split('.')[0]}.${name.replace(/release\\//g, '').split('.')[1]}.x" + } + ] +} \ No newline at end of file From 4ddc3a721acd67f9708f1b3cdb9ca7667e64addf Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:16:16 -0600 Subject: [PATCH 02/95] fix: Add more printouts Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index afc1d3d30fd4..4ffa47b37faf 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -121,6 +121,7 @@ jobs: id: branch_name run: | echo "BRANCH_NAME=temp/${{ steps.validate.outputs.BUILD_TAG }}" >> $GITHUB_OUTPUT + echo "The temp branch name is: ${BRANCH_NAME}" - name: Create a Temporary Semantic Release Branch run: | @@ -152,5 +153,8 @@ jobs: if: always() run: | echo "Deleting the temporary semantic release branch" + echo "Deleting local branch now:" git branch -d ${{ steps.branch_name.outputs.BRANCH_NAME }} + + echo "Deleting remote branch now:" git push -d origin ${{ steps.branch_name.outputs.BRANCH_NAME }} From eb9d97ed368a80e17a3cdd9ea0e0ace9e0fd7fb1 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:25:27 -0600 Subject: [PATCH 03/95] fix: Fix deleting branch correctly Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 4ffa47b37faf..21d61a69bb2e 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -83,7 +83,12 @@ jobs: ref: "14967-semantic-release-workflow-update" - name: Copy Private .releaserc file to Github Workspace - run: cp -f private/.releaserc .releaserc + run: | + echo "Copying the .releaserc file" + cp -f private/.releaserc .releaserc + + echo "Removing private directory" + rm -rf private - name: Display Current Branch or Tag run: | @@ -149,6 +154,15 @@ jobs: fi npx semantic-release ${ARGS} + - name: Ensure Branch Not in Use and Delete Worktree + if: always() + run: | + # Switch to a safe branch (e.g., main) + git checkout main + + # Remove the worktree if it exists + git worktree list | grep ${{ steps.branch_name.outputs.BRANCH_NAME }} | awk '{print $1}' | xargs -r git worktree remove + - name: Delete the Temporary Semantic Release Branch if: always() run: | From b3803f9460a850dab78263ca1773c5570c8abe38 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:29:25 -0600 Subject: [PATCH 04/95] fix: Fix error exit when checking worktree Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 21d61a69bb2e..5e1ed390a3dc 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -159,9 +159,16 @@ jobs: run: | # Switch to a safe branch (e.g., main) git checkout main - - # Remove the worktree if it exists - git worktree list | grep ${{ steps.branch_name.outputs.BRANCH_NAME }} | awk '{print $1}' | xargs -r git worktree remove + + # Check if the branch is associated with a worktree and remove the worktree if it exists + worktree_path=$(git worktree list | grep ${{ steps.branch_name.outputs.BRANCH_NAME }} | awk '{print $1}') + + if [ -n "$worktree_path" ]; then + echo "Removing worktree at $worktree_path" + git worktree remove "$worktree_path" + else + echo "No worktree found for branch ${{ steps.branch_name.outputs.BRANCH_NAME }}" + fi - name: Delete the Temporary Semantic Release Branch if: always() From 6d28519cf05d6ee1f8207ceabee29754f6b8ddb1 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:32:56 -0600 Subject: [PATCH 05/95] fix: add debug for temp branch deletion Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 5e1ed390a3dc..c7a5f0aa37df 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -157,6 +157,7 @@ jobs: - name: Ensure Branch Not in Use and Delete Worktree if: always() run: | + set +x # Switch to a safe branch (e.g., main) git checkout main From 4fcbb4d39876777326b76651f85432ef347fecb5 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:38:04 -0600 Subject: [PATCH 06/95] fix: add more debugging output Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index c7a5f0aa37df..5bb25ff53a19 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -133,10 +133,14 @@ jobs: echo "Going to run the following command:" echo "git checkout -b ${{ steps.branch_name.outputs.BRANCH_NAME }}" git checkout -b ${{ steps.branch_name.outputs.BRANCH_NAME }} - - echo "Checked out to:" - echo git status - + + - name: Echo Current Branch Name + run: | + current_branch=$(git symbolic-ref --short HEAD) + echo "Currently on branch: $current_branch" + + - name: Push Temporary Branch to Origin + run: | echo "Pushing branch to origin:" git push --set-upstream origin ${{ steps.branch_name.outputs.BRANCH_NAME }} @@ -160,15 +164,15 @@ jobs: set +x # Switch to a safe branch (e.g., main) git checkout main - + # Check if the branch is associated with a worktree and remove the worktree if it exists - worktree_path=$(git worktree list | grep ${{ steps.branch_name.outputs.BRANCH_NAME }} | awk '{print $1}') + worktree_path=$(git worktree list | grep ${{ steps.branch_name.outputs.BRANCH_NAME }} || true) if [ -n "$worktree_path" ]; then - echo "Removing worktree at $worktree_path" - git worktree remove "$worktree_path" + echo "Removing worktree at $worktree_path" + git worktree remove "$worktree_path" else - echo "No worktree found for branch ${{ steps.branch_name.outputs.BRANCH_NAME }}" + echo "No worktree found for branch ${{ steps.branch_name.outputs.BRANCH_NAME }}" fi - name: Delete the Temporary Semantic Release Branch From 7e49d99eb5f5ebf27021317b87f1bea2b721794a Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:43:18 -0600 Subject: [PATCH 07/95] fix: add print next version step Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 5bb25ff53a19..beaeb8f79947 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -144,6 +144,12 @@ jobs: echo "Pushing branch to origin:" git push --set-upstream origin ${{ steps.branch_name.outputs.BRANCH_NAME }} + - name: Calculate and Print Next Version + run: | + echo "Running semantic-release in dry-run mode to calculate the next version" + VERSION=$(npx semantic-release --dry-run --no-ci | grep 'The next release version is' | awk '{print $NF}') + echo "The next version is: $VERSION" + - name: Publish Semantic Release env: GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} @@ -161,7 +167,6 @@ jobs: - name: Ensure Branch Not in Use and Delete Worktree if: always() run: | - set +x # Switch to a safe branch (e.g., main) git checkout main From 15ba288ef99c06076f092b21e2bf5023fd3bd456 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:46:07 -0600 Subject: [PATCH 08/95] fix: remove next version printing Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index beaeb8f79947..e82f35b6ce00 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -144,12 +144,6 @@ jobs: echo "Pushing branch to origin:" git push --set-upstream origin ${{ steps.branch_name.outputs.BRANCH_NAME }} - - name: Calculate and Print Next Version - run: | - echo "Running semantic-release in dry-run mode to calculate the next version" - VERSION=$(npx semantic-release --dry-run --no-ci | grep 'The next release version is' | awk '{print $NF}') - echo "The next version is: $VERSION" - - name: Publish Semantic Release env: GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} From bc09303cadae33c364b5231646048c920410735a Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:47:39 -0600 Subject: [PATCH 09/95] fix: add TODO comments for steps to remove before merging to mainline Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index e82f35b6ce00..5eaf61bcd999 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -76,12 +76,14 @@ jobs: ref: ${{ steps.validate.outputs.BUILD_TAG }} token: ${{ secrets.GH_ACCESS_TOKEN }} - - name: Checkout Code + # TODO: Remove this step before mainline merge + - name: Checkout Code - Private Repo Temporarily uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: path: "private" ref: "14967-semantic-release-workflow-update" + # TODO: Remove this step before mainline merge - name: Copy Private .releaserc file to Github Workspace run: | echo "Copying the .releaserc file" From 421f8826848d6ed1dd2b911e0eff09feadae5df8 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:49:18 -0600 Subject: [PATCH 10/95] fix: clean up spacing Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 5eaf61bcd999..a81539f6952f 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -163,17 +163,17 @@ jobs: - name: Ensure Branch Not in Use and Delete Worktree if: always() run: | - # Switch to a safe branch (e.g., main) + # Switch to main git checkout main # Check if the branch is associated with a worktree and remove the worktree if it exists worktree_path=$(git worktree list | grep ${{ steps.branch_name.outputs.BRANCH_NAME }} || true) if [ -n "$worktree_path" ]; then - echo "Removing worktree at $worktree_path" - git worktree remove "$worktree_path" + echo "Removing worktree at $worktree_path" + git worktree remove "$worktree_path" else - echo "No worktree found for branch ${{ steps.branch_name.outputs.BRANCH_NAME }}" + echo "No worktree found for branch ${{ steps.branch_name.outputs.BRANCH_NAME }}" fi - name: Delete the Temporary Semantic Release Branch From f20704449902bcfe4fe8d1ac47efea1a421d5386 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 20:54:05 -0600 Subject: [PATCH 11/95] fix: add generate changelog step Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index a81539f6952f..ad521498055b 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -160,6 +160,13 @@ jobs: fi npx semantic-release ${ARGS} + - name: Generate Changelog + run: | + echo "Generating changelog" + changelog=$(npx semantic-release --dry-run --no-ci --generate-notes) + echo "Changelog generated:" + echo "$changelog" + - name: Ensure Branch Not in Use and Delete Worktree if: always() run: | From 9daaa9416ec2aba642e4d823b5355443ab96fea8 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 21:04:30 -0600 Subject: [PATCH 12/95] fix: checkout the branch 14967-clean-semantic-release-workflow in private repo Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index ad521498055b..52f07f0a0e6e 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -81,7 +81,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: path: "private" - ref: "14967-semantic-release-workflow-update" + ref: "14967-clean-semantic-release-workflow" # TODO: Remove this step before mainline merge - name: Copy Private .releaserc file to Github Workspace From 8816e9c449576b5e3300b1d566291432997d7f43 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 21:11:41 -0600 Subject: [PATCH 13/95] fix: add branch flag to semantic release Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 52f07f0a0e6e..4d4601282109 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -158,7 +158,9 @@ jobs: if [[ "${{ github.event.inputs.dry-run-enabled }}" == true ]]; then ARGS="--dry-run" fi - npx semantic-release ${ARGS} + echo "Running semantic release command:" + echo "npx semantic-release ${ARGS} --branch ${{ steps.branch_name.outputs.BRANCH_NAME }}" + npx semantic-release ${ARGS} --branch ${{ steps.branch_name.outputs.BRANCH_NAME }} - name: Generate Changelog run: | From 2fc479cf7f2ab015b1f1ffc3f6acd91c854bd7bf Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 22:12:29 -0600 Subject: [PATCH 14/95] fix: Add prune tag step Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 4d4601282109..17d7d7250b03 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -146,6 +146,11 @@ jobs: echo "Pushing branch to origin:" git push --set-upstream origin ${{ steps.branch_name.outputs.BRANCH_NAME }} + - name: Prune Tags + run: | + echo "Prune Tags from Local" + git fetch --prune-tags + - name: Publish Semantic Release env: GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} From 88b680b78b79e4a650d5d1d939e981cfb3c42661 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 22:34:51 -0600 Subject: [PATCH 15/95] fix: Add listing of git merged tags Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 17d7d7250b03..a1ab5513414e 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -150,6 +150,12 @@ jobs: run: | echo "Prune Tags from Local" git fetch --prune-tags + + + - name: Git Merged Tags + run: | + echo "Git Merged Tags" + git tag --merged ${{ steps.branch_name.outputs.BRANCH_NAME }} - name: Publish Semantic Release env: From ecf6d93d0e62460e0cee5b6bcfc90860829a733b Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 22:37:30 -0600 Subject: [PATCH 16/95] fix: run exactly command that is failing Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index a1ab5513414e..5daf6185e3e3 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -155,7 +155,7 @@ jobs: - name: Git Merged Tags run: | echo "Git Merged Tags" - git tag --merged ${{ steps.branch_name.outputs.BRANCH_NAME }} + git tag --merged 14967-clean-semantic-release-workflow - name: Publish Semantic Release env: From f0d475883119e724a0f9ae827bf507d99385c720 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 22:40:15 -0600 Subject: [PATCH 17/95] fix: additional debugging Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 5daf6185e3e3..7c4cdfcbe1c2 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -154,7 +154,10 @@ jobs: - name: Git Merged Tags run: | + set +x echo "Git Merged Tags" + git fetch + git branch -la | grep semantic git tag --merged 14967-clean-semantic-release-workflow - name: Publish Semantic Release From 590d8f5e166cc720d535dbd617b384397114a16a Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 22:43:39 -0600 Subject: [PATCH 18/95] fix: comment out, add rev-parse to the semantic release branch Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 7c4cdfcbe1c2..0a65f87b3e7f 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -158,7 +158,7 @@ jobs: echo "Git Merged Tags" git fetch git branch -la | grep semantic - git tag --merged 14967-clean-semantic-release-workflow + git tag --merged ${git rev-parse 14967-clean-semantic-release-workflow} - name: Publish Semantic Release env: @@ -176,12 +176,12 @@ jobs: echo "npx semantic-release ${ARGS} --branch ${{ steps.branch_name.outputs.BRANCH_NAME }}" npx semantic-release ${ARGS} --branch ${{ steps.branch_name.outputs.BRANCH_NAME }} - - name: Generate Changelog - run: | - echo "Generating changelog" - changelog=$(npx semantic-release --dry-run --no-ci --generate-notes) - echo "Changelog generated:" - echo "$changelog" +# - name: Generate Changelog +# run: | +# echo "Generating changelog" +# changelog=$(npx semantic-release --dry-run --no-ci --generate-notes) +# echo "Changelog generated:" +# echo "$changelog" - name: Ensure Branch Not in Use and Delete Worktree if: always() From d69ce639fd392bdd89a9fd180e3982380e127ec6 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 22:46:16 -0600 Subject: [PATCH 19/95] fix: fix the bad substitution Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 0a65f87b3e7f..62bf2a38351f 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -158,7 +158,8 @@ jobs: echo "Git Merged Tags" git fetch git branch -la | grep semantic - git tag --merged ${git rev-parse 14967-clean-semantic-release-workflow} + BRANCH_HEAD_COMMIT = git rev-parse 14967-clean-semantic-release-workflow + git tag --merged ${BRANCH_HEAD_COMMIT} - name: Publish Semantic Release env: From 82401f5b1fb5335985d9096b21a0af18352c7408 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 22:48:40 -0600 Subject: [PATCH 20/95] fix: fix variable for real this time Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 62bf2a38351f..d288e5e10631 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -158,7 +158,7 @@ jobs: echo "Git Merged Tags" git fetch git branch -la | grep semantic - BRANCH_HEAD_COMMIT = git rev-parse 14967-clean-semantic-release-workflow + BRANCH_HEAD_COMMIT=$(git rev-parse 14967-clean-semantic-release-workflow) git tag --merged ${BRANCH_HEAD_COMMIT} - name: Publish Semantic Release From 76a263d4667e09bfb0f4b811e2abd4e002fdf0d9 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 22:52:05 -0600 Subject: [PATCH 21/95] fix: add more debugging statements Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index d288e5e10631..3d861c9f0256 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -156,9 +156,17 @@ jobs: run: | set +x echo "Git Merged Tags" + echo "Git fetch" git fetch + echo "Git branch -la grep semantic" git branch -la | grep semantic - BRANCH_HEAD_COMMIT=$(git rev-parse 14967-clean-semantic-release-workflow) + echo "Checkout clean semantic release workflow" + git checkout 14967-clean-semantic-release-workflow + echo "Find the head commit SHA" + BRANCH_HEAD_COMMIT=$(git rev-parse HEAD) + echo "Checkout the temp/build branch" + git checkout ${{ steps.branch_name.outputs.BRANCH_NAME }} + echo "Check the merged tags now" git tag --merged ${BRANCH_HEAD_COMMIT} - name: Publish Semantic Release From ab0cc6b7a1e3b6e0b225f5ad1efeb59bf455fda4 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 22:54:29 -0600 Subject: [PATCH 22/95] fix: reorganize, add stashing Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 22 +++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 3d861c9f0256..3258883989b3 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -115,15 +115,6 @@ jobs: with: node-version: 20 - - name: Install Dependencies - run: | - echo "Installing semantic-release" - npm install -g semantic-release@24.2.0 @semantic-release/git@10.0.1 @semantic-release/github@11.0.1 \ - @semantic-release/exec@6.0.3 semantic-release-helm3@2.9.3 \ - conventional-changelog-conventionalcommits@8.0.0 \ - @commitlint/cli@19.5.0 @commitlint/config-conventional@19.5.0 \ - marked-mangle@1.1.10 marked-gfm-heading-id@4.1.1 semantic-release-conventional-commits@3.0.0 - - name: Calculate Temporary Semantic Release Branch Name id: branch_name run: | @@ -150,7 +141,7 @@ jobs: run: | echo "Prune Tags from Local" git fetch --prune-tags - + - name: Git Merged Tags run: | @@ -161,14 +152,25 @@ jobs: echo "Git branch -la grep semantic" git branch -la | grep semantic echo "Checkout clean semantic release workflow" + git stash git checkout 14967-clean-semantic-release-workflow echo "Find the head commit SHA" BRANCH_HEAD_COMMIT=$(git rev-parse HEAD) echo "Checkout the temp/build branch" git checkout ${{ steps.branch_name.outputs.BRANCH_NAME }} + git stash pop echo "Check the merged tags now" git tag --merged ${BRANCH_HEAD_COMMIT} + - name: Install Dependencies + run: | + echo "Installing semantic-release" + npm install -g semantic-release@24.2.0 @semantic-release/git@10.0.1 @semantic-release/github@11.0.1 \ + @semantic-release/exec@6.0.3 semantic-release-helm3@2.9.3 \ + conventional-changelog-conventionalcommits@8.0.0 \ + @commitlint/cli@19.5.0 @commitlint/config-conventional@19.5.0 \ + marked-mangle@1.1.10 marked-gfm-heading-id@4.1.1 semantic-release-conventional-commits@3.0.0 + - name: Publish Semantic Release env: GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} From 5b3f3444d5864a8d4b237cf73d292f010e899b8b Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 22:56:46 -0600 Subject: [PATCH 23/95] fix: stash an untracked file releaserc Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 3258883989b3..dfea806d25a0 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -152,7 +152,7 @@ jobs: echo "Git branch -la grep semantic" git branch -la | grep semantic echo "Checkout clean semantic release workflow" - git stash + git stash -u git checkout 14967-clean-semantic-release-workflow echo "Find the head commit SHA" BRANCH_HEAD_COMMIT=$(git rev-parse HEAD) From fb2ac119536166d8139a7ab2bde3ffbebce89152 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 23:01:14 -0600 Subject: [PATCH 24/95] fix: clean up debug statements, add TODO item Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index dfea806d25a0..fae73d0698e8 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -137,29 +137,16 @@ jobs: echo "Pushing branch to origin:" git push --set-upstream origin ${{ steps.branch_name.outputs.BRANCH_NAME }} - - name: Prune Tags - run: | - echo "Prune Tags from Local" - git fetch --prune-tags - - + #TODO: Revisit this before merging to mainline - name: Git Merged Tags run: | - set +x echo "Git Merged Tags" - echo "Git fetch" git fetch - echo "Git branch -la grep semantic" - git branch -la | grep semantic - echo "Checkout clean semantic release workflow" git stash -u git checkout 14967-clean-semantic-release-workflow - echo "Find the head commit SHA" BRANCH_HEAD_COMMIT=$(git rev-parse HEAD) - echo "Checkout the temp/build branch" git checkout ${{ steps.branch_name.outputs.BRANCH_NAME }} git stash pop - echo "Check the merged tags now" git tag --merged ${BRANCH_HEAD_COMMIT} - name: Install Dependencies From 81e4027c81fd2f5ba321be8c09293e10fc989b18 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 23:04:16 -0600 Subject: [PATCH 25/95] fix: add git status call after semantic release runs Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index fae73d0698e8..57d377ac5103 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -181,6 +181,9 @@ jobs: # echo "Changelog generated:" # echo "$changelog" + - name: View Status After Running Semantic Release + run: git status + - name: Ensure Branch Not in Use and Delete Worktree if: always() run: | From 166002655e8f70935acdeca69fadbab667a8cea4 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 23:09:52 -0600 Subject: [PATCH 26/95] fix: attempt deleting the semantic release branch called from Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 57d377ac5103..e69455b98886 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -166,6 +166,7 @@ jobs: GIT_COMMITTER_NAME: ${{ secrets.GIT_USER_NAME }} GIT_COMMITTER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} run: | + git branch -d 14967-clean-semantic-release-workflow ARGS="" if [[ "${{ github.event.inputs.dry-run-enabled }}" == true ]]; then ARGS="--dry-run" From 57fcaefc62bd5ebffd8c1e0aee989218e214c605 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 23:12:57 -0600 Subject: [PATCH 27/95] fix: restore branch Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index e69455b98886..57d377ac5103 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -166,7 +166,6 @@ jobs: GIT_COMMITTER_NAME: ${{ secrets.GIT_USER_NAME }} GIT_COMMITTER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} run: | - git branch -d 14967-clean-semantic-release-workflow ARGS="" if [[ "${{ github.event.inputs.dry-run-enabled }}" == true ]]; then ARGS="--dry-run" From d065e9694de846c1aeca16ae8106e532a1688736 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 17 Jan 2025 23:19:59 -0600 Subject: [PATCH 28/95] fix: add more fetching Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 57d377ac5103..4ccb186dcf0e 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -141,9 +141,11 @@ jobs: - name: Git Merged Tags run: | echo "Git Merged Tags" - git fetch + git fetch --all + git fetch --tags git stash -u git checkout 14967-clean-semantic-release-workflow + git pull BRANCH_HEAD_COMMIT=$(git rev-parse HEAD) git checkout ${{ steps.branch_name.outputs.BRANCH_NAME }} git stash pop From 8ac1dc4d64ecef6c8f64ce63ea38711eb6896935 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 10:39:54 -0600 Subject: [PATCH 29/95] fix: update workflows for new branch, implement basic git-semver Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 62 ++++++++++++--------- .releaserc | 2 +- 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 4ccb186dcf0e..45ceaae9ee4c 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -81,7 +81,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: path: "private" - ref: "14967-clean-semantic-release-workflow" + ref: "14967-git-semver-test-branch" # TODO: Remove this step before mainline merge - name: Copy Private .releaserc file to Github Workspace @@ -144,37 +144,37 @@ jobs: git fetch --all git fetch --tags git stash -u - git checkout 14967-clean-semantic-release-workflow + git checkout 14967-git-semver-test-branch git pull BRANCH_HEAD_COMMIT=$(git rev-parse HEAD) git checkout ${{ steps.branch_name.outputs.BRANCH_NAME }} git stash pop git tag --merged ${BRANCH_HEAD_COMMIT} - - name: Install Dependencies - run: | - echo "Installing semantic-release" - npm install -g semantic-release@24.2.0 @semantic-release/git@10.0.1 @semantic-release/github@11.0.1 \ - @semantic-release/exec@6.0.3 semantic-release-helm3@2.9.3 \ - conventional-changelog-conventionalcommits@8.0.0 \ - @commitlint/cli@19.5.0 @commitlint/config-conventional@19.5.0 \ - marked-mangle@1.1.10 marked-gfm-heading-id@4.1.1 semantic-release-conventional-commits@3.0.0 - - - name: Publish Semantic Release - env: - GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} - GIT_AUTHOR_NAME: ${{ secrets.GIT_USER_NAME }} - GIT_AUTHOR_EMAIL: ${{ secrets.GIT_USER_EMAIL }} - GIT_COMMITTER_NAME: ${{ secrets.GIT_USER_NAME }} - GIT_COMMITTER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} - run: | - ARGS="" - if [[ "${{ github.event.inputs.dry-run-enabled }}" == true ]]; then - ARGS="--dry-run" - fi - echo "Running semantic release command:" - echo "npx semantic-release ${ARGS} --branch ${{ steps.branch_name.outputs.BRANCH_NAME }}" - npx semantic-release ${ARGS} --branch ${{ steps.branch_name.outputs.BRANCH_NAME }} +# - name: Install Dependencies +# run: | +# echo "Installing semantic-release" +# npm install -g semantic-release@24.2.0 @semantic-release/git@10.0.1 @semantic-release/github@11.0.1 \ +# @semantic-release/exec@6.0.3 semantic-release-helm3@2.9.3 \ +# conventional-changelog-conventionalcommits@8.0.0 \ +# @commitlint/cli@19.5.0 @commitlint/config-conventional@19.5.0 \ +# marked-mangle@1.1.10 marked-gfm-heading-id@4.1.1 semantic-release-conventional-commits@3.0.0 +# +# - name: Publish Semantic Release +# env: +# GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} +# GIT_AUTHOR_NAME: ${{ secrets.GIT_USER_NAME }} +# GIT_AUTHOR_EMAIL: ${{ secrets.GIT_USER_EMAIL }} +# GIT_COMMITTER_NAME: ${{ secrets.GIT_USER_NAME }} +# GIT_COMMITTER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} +# run: | +# ARGS="" +# if [[ "${{ github.event.inputs.dry-run-enabled }}" == true ]]; then +# ARGS="--dry-run" +# fi +# echo "Running semantic release command:" +# echo "npx semantic-release ${ARGS} --branch ${{ steps.branch_name.outputs.BRANCH_NAME }}" +# npx semantic-release ${ARGS} --branch ${{ steps.branch_name.outputs.BRANCH_NAME }} # - name: Generate Changelog # run: | @@ -183,6 +183,16 @@ jobs: # echo "Changelog generated:" # echo "$changelog" + - name: Set up git-semver + uses: DJ-BBot/setup-git-semver@v1 + with: + version: 'latest' + + - name: Get next computed version + run: | + echo "Getting next computed version" + git-semver next --stable=false + - name: View Status After Running Semantic Release run: git status diff --git a/.releaserc b/.releaserc index c433f1eda1bd..4e70f09e2e6c 100644 --- a/.releaserc +++ b/.releaserc @@ -15,7 +15,7 @@ ], "branches":[ { - "name": "14967-clean-semantic-release-workflow" + "name": "14967-git-semver-test-branch" }, { "name": "main" From b1d4b4dccc9fc616c7ae03728946f4825a743067 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 10:42:17 -0600 Subject: [PATCH 30/95] fix: change implementation of git semver Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 45ceaae9ee4c..3c194a67c9c1 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -183,10 +183,8 @@ jobs: # echo "Changelog generated:" # echo "$changelog" - - name: Set up git-semver - uses: DJ-BBot/setup-git-semver@v1 - with: - version: 'latest' + - name: Git-Semver Setup Action + uses: DJ-BBot/setup-git-semver@v1.0.1 - name: Get next computed version run: | From bcfd55d588fb1f7041d48929dd464d66712c9212 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 10:51:54 -0600 Subject: [PATCH 31/95] fix: add tagging and delete tag based on calculcated next version Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 25 ++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 3c194a67c9c1..be73fadc6531 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -187,13 +187,36 @@ jobs: uses: DJ-BBot/setup-git-semver@v1.0.1 - name: Get next computed version + id: next_version run: | echo "Getting next computed version" - git-semver next --stable=false + echo "next_release=$(git-semver next --stable=false)" >> >> $GITHUB_OUTPUT + + - name: Apply next computed version tag + run: | + echo "Applying computed version tag" + git tag -a v${{ steps.next_version.outputs.next_release }} -m "v${{ steps.next_version.outputs.next_release }}" + + - name: List all tags with 59 in the tag + run: | + git tag -l | grep 59 + +# - name: Create Release Notes with Conventional Commits +# run: | +# git-semver log --conventional-commits ${{ steps.next_version.outputs.next_release }} +# +# - name: Create Release Notes with Markdown +# run: | +# git-semver log --markdown ${{ steps.next_version.outputs.next_release }} - name: View Status After Running Semantic Release run: git status + # TODO: Remove this delete step before merging to mainline + - name: Delete Created Tag + run: | + git tag --delete v${{ steps.next_version.outputs.next_release }} + - name: Ensure Branch Not in Use and Delete Worktree if: always() run: | From 3f546f698b23e7c7251f1ea507cae3c8a2d841cc Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 10:54:26 -0600 Subject: [PATCH 32/95] fix: fix typo Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index be73fadc6531..3e2d4474bfee 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -190,7 +190,7 @@ jobs: id: next_version run: | echo "Getting next computed version" - echo "next_release=$(git-semver next --stable=false)" >> >> $GITHUB_OUTPUT + echo "next_release=$(git-semver next --stable=false)" >> $GITHUB_OUTPUT - name: Apply next computed version tag run: | From f8abbf21ed1d8d49a13898bddc142ef1b64cd9f7 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 11:08:30 -0600 Subject: [PATCH 33/95] fix: implement log with markdown flag Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 3e2d4474bfee..27ac3c027dca 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -204,10 +204,10 @@ jobs: # - name: Create Release Notes with Conventional Commits # run: | # git-semver log --conventional-commits ${{ steps.next_version.outputs.next_release }} -# -# - name: Create Release Notes with Markdown -# run: | -# git-semver log --markdown ${{ steps.next_version.outputs.next_release }} + + - name: Create Release Notes with Markdown + run: | + echo git-semver log --markdown ${{ steps.next_version.outputs.next_release }} - name: View Status After Running Semantic Release run: git status From 3d8f3e1439a7e78f79cd0f0da0c3de664bcae292 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 11:10:54 -0600 Subject: [PATCH 34/95] fix: run the log command Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 27ac3c027dca..e81a7fccbee2 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -208,6 +208,7 @@ jobs: - name: Create Release Notes with Markdown run: | echo git-semver log --markdown ${{ steps.next_version.outputs.next_release }} + git-semver log --markdown ${{ steps.next_version.outputs.next_release }} - name: View Status After Running Semantic Release run: git status From 614ac7fc2c4ed534057680ced7614a2aac03284f Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 11:14:54 -0600 Subject: [PATCH 35/95] fix: switch to explicit commit sha for git-semver, attempt conventional commits release notes Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index e81a7fccbee2..ee0fdc7be9a5 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -184,7 +184,7 @@ jobs: # echo "$changelog" - name: Git-Semver Setup Action - uses: DJ-BBot/setup-git-semver@v1.0.1 + uses: DJ-BBot/setup-git-semver@7ede9a8b0c0f4cfff14e9b0a8771dbc546f2b76b # v1.0.1 - name: Get next computed version id: next_version @@ -201,9 +201,9 @@ jobs: run: | git tag -l | grep 59 -# - name: Create Release Notes with Conventional Commits -# run: | -# git-semver log --conventional-commits ${{ steps.next_version.outputs.next_release }} + - name: Create Release Notes with Conventional Commits + run: | + git-semver log --conventional-commits ${{ steps.next_version.outputs.next_release }} - name: Create Release Notes with Markdown run: | From ff6ceb3663d4fcde76ded6b7f1ef00a82e6003ff Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 11:26:03 -0600 Subject: [PATCH 36/95] fix: Remove the releaserc file management Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 30 ++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index ee0fdc7be9a5..eb455f988b82 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -76,21 +76,21 @@ jobs: ref: ${{ steps.validate.outputs.BUILD_TAG }} token: ${{ secrets.GH_ACCESS_TOKEN }} - # TODO: Remove this step before mainline merge - - name: Checkout Code - Private Repo Temporarily - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - path: "private" - ref: "14967-git-semver-test-branch" - - # TODO: Remove this step before mainline merge - - name: Copy Private .releaserc file to Github Workspace - run: | - echo "Copying the .releaserc file" - cp -f private/.releaserc .releaserc - - echo "Removing private directory" - rm -rf private +# # TODO: Remove this step before mainline merge +# - name: Checkout Code - Private Repo Temporarily +# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 +# with: +# path: "private" +# ref: "14967-git-semver-test-branch" +# +# # TODO: Remove this step before mainline merge +# - name: Copy Private .releaserc file to Github Workspace +# run: | +# echo "Copying the .releaserc file" +# cp -f private/.releaserc .releaserc +# +# echo "Removing private directory" +# rm -rf private - name: Display Current Branch or Tag run: | From fe1c614937d24a137a35adea2e82da10baf7f159 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 11:28:19 -0600 Subject: [PATCH 37/95] fix: remove more steps Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 26 ++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index eb455f988b82..2057e8019e92 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -137,19 +137,19 @@ jobs: echo "Pushing branch to origin:" git push --set-upstream origin ${{ steps.branch_name.outputs.BRANCH_NAME }} - #TODO: Revisit this before merging to mainline - - name: Git Merged Tags - run: | - echo "Git Merged Tags" - git fetch --all - git fetch --tags - git stash -u - git checkout 14967-git-semver-test-branch - git pull - BRANCH_HEAD_COMMIT=$(git rev-parse HEAD) - git checkout ${{ steps.branch_name.outputs.BRANCH_NAME }} - git stash pop - git tag --merged ${BRANCH_HEAD_COMMIT} +# #TODO: Revisit this before merging to mainline +# - name: Git Merged Tags +# run: | +# echo "Git Merged Tags" +# git fetch --all +# git fetch --tags +# git stash -u +# git checkout 14967-git-semver-test-branch +# git pull +# BRANCH_HEAD_COMMIT=$(git rev-parse HEAD) +# git checkout ${{ steps.branch_name.outputs.BRANCH_NAME }} +# git stash pop +# git tag --merged ${BRANCH_HEAD_COMMIT} # - name: Install Dependencies # run: | From f0b9cac6b46c4216fcab3622e2164e06f99c8142 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 11:31:46 -0600 Subject: [PATCH 38/95] fix: previous commit works. removing releaserc file as a test Signed-off-by: Andrew Brandt --- .releaserc | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 .releaserc diff --git a/.releaserc b/.releaserc deleted file mode 100644 index 4e70f09e2e6c..000000000000 --- a/.releaserc +++ /dev/null @@ -1,32 +0,0 @@ -{ - "releaseRules": [ - { "breaking": "true", "release": "minor"} - ], - "plugins": [ - "@semantic-release/commit-analyzer", - [ - "@semantic-release/release-notes-generator", - { - "preset": "conventionalcommits" - } - ], - "@semantic-release/git", - "@semantic-release/github" - ], - "branches":[ - { - "name": "14967-git-semver-test-branch" - }, - { - "name": "main" - }, - { - "name": "temp/build-*" - }, - { - "name": "release/([0-9]+).([0-9]+)", - "channel": "${name.replace(/release\\//g, '').split('.')[0]}.${name.replace(/release\\//g, '').split('.')[1]}.x", - "range": "${name.replace(/release\\//g, '').split('.')[0]}.${name.replace(/release\\//g, '').split('.')[1]}.x" - } - ] -} \ No newline at end of file From 0657e184dc357b155f92d6b10866995d166848f6 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 11:37:47 -0600 Subject: [PATCH 39/95] fix: Add additional printouts, clean up some steps Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 2057e8019e92..ce71d6d6f2e2 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -191,11 +191,14 @@ jobs: run: | echo "Getting next computed version" echo "next_release=$(git-semver next --stable=false)" >> $GITHUB_OUTPUT + echo "Next release version is: ${next_release}" + # TODO: Do we sign our tags? - name: Apply next computed version tag run: | echo "Applying computed version tag" git tag -a v${{ steps.next_version.outputs.next_release }} -m "v${{ steps.next_version.outputs.next_release }}" + echo "Applied tag v${{ steps.next_version.outputs.next_release }}" - name: List all tags with 59 in the tag run: | @@ -210,6 +213,12 @@ jobs: echo git-semver log --markdown ${{ steps.next_version.outputs.next_release }} git-semver log --markdown ${{ steps.next_version.outputs.next_release }} + - name: Clean Up git-semver + run: | + echo "Deleting git-semver directory" + rm -rf git-semver + echo "Successfully removed git-semver directory" + - name: View Status After Running Semantic Release run: git status From a4b346af354fec54c4b7853e590fff7f5115009e Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 11:48:13 -0600 Subject: [PATCH 40/95] fix: add summary step output Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 22 +++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index ce71d6d6f2e2..1a666488b8c4 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -65,8 +65,9 @@ jobs: build_tag="build-$padded_number" echo "Prefixed number is: $build_tag" - # Export to Github output - echo "BUILD_TAG=$build_tag" >> $GITHUB_OUTPUT + # Export to Github output and Github summary + echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} + printf "Build Tag to Release: ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} - name: Checkout Code id: checkout_code @@ -118,8 +119,9 @@ jobs: - name: Calculate Temporary Semantic Release Branch Name id: branch_name run: | - echo "BRANCH_NAME=temp/${{ steps.validate.outputs.BUILD_TAG }}" >> $GITHUB_OUTPUT + echo "BRANCH_NAME=temp/${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_OUTPUT} echo "The temp branch name is: ${BRANCH_NAME}" + printf "The temp branch name for release is: ${BRANCH_NAME}" >> ${GITHUB_STEP_SUMMARY} - name: Create a Temporary Semantic Release Branch run: | @@ -186,21 +188,23 @@ jobs: - name: Git-Semver Setup Action uses: DJ-BBot/setup-git-semver@7ede9a8b0c0f4cfff14e9b0a8771dbc546f2b76b # v1.0.1 - - name: Get next computed version + - name: Compute Next Version Number id: next_version run: | - echo "Getting next computed version" - echo "next_release=$(git-semver next --stable=false)" >> $GITHUB_OUTPUT + echo "Compute next version number using git-semver" + echo "next_release=$(git-semver next --stable=false)" >> ${GITHUB_OUTPUT} echo "Next release version is: ${next_release}" + printf "Next Release Version Number: ${next_release}" >> ${GITHUB_STEP_SUMMARY} # TODO: Do we sign our tags? - - name: Apply next computed version tag + - name: Apply Tag with Calculated Next Version run: | echo "Applying computed version tag" git tag -a v${{ steps.next_version.outputs.next_release }} -m "v${{ steps.next_version.outputs.next_release }}" echo "Applied tag v${{ steps.next_version.outputs.next_release }}" + printf "Version Tag Applied: v${{ steps.next_version.outputs.next_release }}" >> ${GITHUB_STEP_SUMMARY} - - name: List all tags with 59 in the tag + - name: List All Tags Containing "59" run: | git tag -l | grep 59 @@ -249,6 +253,8 @@ jobs: echo "Deleting the temporary semantic release branch" echo "Deleting local branch now:" git branch -d ${{ steps.branch_name.outputs.BRANCH_NAME }} + printf "Deleted Temporary Branch from Local Runner" >> ${GITHUB_STEP_SUMMARY} echo "Deleting remote branch now:" git push -d origin ${{ steps.branch_name.outputs.BRANCH_NAME }} + printf "Deleted Temporary Branch from Remote" >> ${GITHUB_STEP_SUMMARY} From 4db1a3072a3e87807f7e30bd0299df67ad3700d0 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 11:51:47 -0600 Subject: [PATCH 41/95] fix: add a step to find current version Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 1a666488b8c4..83beeb87bcaa 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -188,6 +188,12 @@ jobs: - name: Git-Semver Setup Action uses: DJ-BBot/setup-git-semver@7ede9a8b0c0f4cfff14e9b0a8771dbc546f2b76b # v1.0.1 + - name: Identify Current Version Number + run: | + echo "Find the current version number" + current_version=$(git-semver latest) + echo "Current version is: ${current_version}" + - name: Compute Next Version Number id: next_version run: | From 1ebf71d5c4b9176ec8ac2639b24d9724f16b0f18 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 11:54:43 -0600 Subject: [PATCH 42/95] fix: add another output of current version after tagging new release Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 83beeb87bcaa..b1b4298e51dd 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -214,6 +214,13 @@ jobs: run: | git tag -l | grep 59 + - name: Identify Current Version Number After Tagging + run: | + echo "Find the current version number after we applied the new tag" + current_version=$(git-semver latest) + echo "Current version is: ${current_version}" + echo "Should match version we just applied: ${{ steps.next_version.outputs.next_release }}" + - name: Create Release Notes with Conventional Commits run: | git-semver log --conventional-commits ${{ steps.next_version.outputs.next_release }} From 4bdb3a4ad2e4d9fcb1cb842cbb7d4e5e400b1cc7 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 12:22:11 -0600 Subject: [PATCH 43/95] fix: clean up summary output Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index b1b4298e51dd..3ad247aaf15a 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -67,7 +67,7 @@ jobs: # Export to Github output and Github summary echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} - printf "Build Tag to Release: ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} + #printf "Build Tag to Release: ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} - name: Checkout Code id: checkout_code @@ -121,7 +121,7 @@ jobs: run: | echo "BRANCH_NAME=temp/${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_OUTPUT} echo "The temp branch name is: ${BRANCH_NAME}" - printf "The temp branch name for release is: ${BRANCH_NAME}" >> ${GITHUB_STEP_SUMMARY} + #printf "The temp branch name for release is: ${BRANCH_NAME}" >> ${GITHUB_STEP_SUMMARY} - name: Create a Temporary Semantic Release Branch run: | @@ -200,7 +200,7 @@ jobs: echo "Compute next version number using git-semver" echo "next_release=$(git-semver next --stable=false)" >> ${GITHUB_OUTPUT} echo "Next release version is: ${next_release}" - printf "Next Release Version Number: ${next_release}" >> ${GITHUB_STEP_SUMMARY} + #printf "Next Release Version Number: ${next_release}" >> ${GITHUB_STEP_SUMMARY} # TODO: Do we sign our tags? - name: Apply Tag with Calculated Next Version @@ -210,10 +210,6 @@ jobs: echo "Applied tag v${{ steps.next_version.outputs.next_release }}" printf "Version Tag Applied: v${{ steps.next_version.outputs.next_release }}" >> ${GITHUB_STEP_SUMMARY} - - name: List All Tags Containing "59" - run: | - git tag -l | grep 59 - - name: Identify Current Version Number After Tagging run: | echo "Find the current version number after we applied the new tag" @@ -266,7 +262,7 @@ jobs: echo "Deleting the temporary semantic release branch" echo "Deleting local branch now:" git branch -d ${{ steps.branch_name.outputs.BRANCH_NAME }} - printf "Deleted Temporary Branch from Local Runner" >> ${GITHUB_STEP_SUMMARY} + printf "Deleted Temporary Branch from Local Runner\n" >> ${GITHUB_STEP_SUMMARY} echo "Deleting remote branch now:" git push -d origin ${{ steps.branch_name.outputs.BRANCH_NAME }} From b25cff05e051229929a25b8d687bdee002900878 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Sat, 18 Jan 2025 12:22:53 -0600 Subject: [PATCH 44/95] fix: always delete tag Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 3ad247aaf15a..da8d72420ca5 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -237,6 +237,7 @@ jobs: # TODO: Remove this delete step before merging to mainline - name: Delete Created Tag + if: always() run: | git tag --delete v${{ steps.next_version.outputs.next_release }} From 1d81b55e715c0fe70fe05986b3a23d0de1e35201 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 08:56:05 -0600 Subject: [PATCH 45/95] fix: remove commented out steps Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 62 --------------------- 1 file changed, 62 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index da8d72420ca5..80bf8105e466 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -77,22 +77,6 @@ jobs: ref: ${{ steps.validate.outputs.BUILD_TAG }} token: ${{ secrets.GH_ACCESS_TOKEN }} -# # TODO: Remove this step before mainline merge -# - name: Checkout Code - Private Repo Temporarily -# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 -# with: -# path: "private" -# ref: "14967-git-semver-test-branch" -# -# # TODO: Remove this step before mainline merge -# - name: Copy Private .releaserc file to Github Workspace -# run: | -# echo "Copying the .releaserc file" -# cp -f private/.releaserc .releaserc -# -# echo "Removing private directory" -# rm -rf private - - name: Display Current Branch or Tag run: | # Check if it's a tag @@ -139,52 +123,6 @@ jobs: echo "Pushing branch to origin:" git push --set-upstream origin ${{ steps.branch_name.outputs.BRANCH_NAME }} -# #TODO: Revisit this before merging to mainline -# - name: Git Merged Tags -# run: | -# echo "Git Merged Tags" -# git fetch --all -# git fetch --tags -# git stash -u -# git checkout 14967-git-semver-test-branch -# git pull -# BRANCH_HEAD_COMMIT=$(git rev-parse HEAD) -# git checkout ${{ steps.branch_name.outputs.BRANCH_NAME }} -# git stash pop -# git tag --merged ${BRANCH_HEAD_COMMIT} - -# - name: Install Dependencies -# run: | -# echo "Installing semantic-release" -# npm install -g semantic-release@24.2.0 @semantic-release/git@10.0.1 @semantic-release/github@11.0.1 \ -# @semantic-release/exec@6.0.3 semantic-release-helm3@2.9.3 \ -# conventional-changelog-conventionalcommits@8.0.0 \ -# @commitlint/cli@19.5.0 @commitlint/config-conventional@19.5.0 \ -# marked-mangle@1.1.10 marked-gfm-heading-id@4.1.1 semantic-release-conventional-commits@3.0.0 -# -# - name: Publish Semantic Release -# env: -# GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} -# GIT_AUTHOR_NAME: ${{ secrets.GIT_USER_NAME }} -# GIT_AUTHOR_EMAIL: ${{ secrets.GIT_USER_EMAIL }} -# GIT_COMMITTER_NAME: ${{ secrets.GIT_USER_NAME }} -# GIT_COMMITTER_EMAIL: ${{ secrets.GIT_USER_EMAIL }} -# run: | -# ARGS="" -# if [[ "${{ github.event.inputs.dry-run-enabled }}" == true ]]; then -# ARGS="--dry-run" -# fi -# echo "Running semantic release command:" -# echo "npx semantic-release ${ARGS} --branch ${{ steps.branch_name.outputs.BRANCH_NAME }}" -# npx semantic-release ${ARGS} --branch ${{ steps.branch_name.outputs.BRANCH_NAME }} - -# - name: Generate Changelog -# run: | -# echo "Generating changelog" -# changelog=$(npx semantic-release --dry-run --no-ci --generate-notes) -# echo "Changelog generated:" -# echo "$changelog" - - name: Git-Semver Setup Action uses: DJ-BBot/setup-git-semver@7ede9a8b0c0f4cfff14e9b0a8771dbc546f2b76b # v1.0.1 From 837954911681e8d361ae35571943e0a75526fc8a Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 13:20:32 -0600 Subject: [PATCH 46/95] fix: cleanup code Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 80bf8105e466..c5276fac6425 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -105,7 +105,7 @@ jobs: run: | echo "BRANCH_NAME=temp/${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_OUTPUT} echo "The temp branch name is: ${BRANCH_NAME}" - #printf "The temp branch name for release is: ${BRANCH_NAME}" >> ${GITHUB_STEP_SUMMARY} + printf "The temp branch name for release is: ${BRANCH_NAME}" >> ${GITHUB_STEP_SUMMARY} - name: Create a Temporary Semantic Release Branch run: | @@ -132,6 +132,8 @@ jobs: current_version=$(git-semver latest) echo "Current version is: ${current_version}" + # IF HIERO/HEDERA TRANSITIONS TO A MAJOR RELEASE NUMBER (1.0.0+) + # stable = false WILL NO LONGER BE VALID - name: Compute Next Version Number id: next_version run: | @@ -140,7 +142,6 @@ jobs: echo "Next release version is: ${next_release}" #printf "Next Release Version Number: ${next_release}" >> ${GITHUB_STEP_SUMMARY} - # TODO: Do we sign our tags? - name: Apply Tag with Calculated Next Version run: | echo "Applying computed version tag" @@ -157,6 +158,7 @@ jobs: - name: Create Release Notes with Conventional Commits run: | + echo git-semver log --conventional-commits ${{ steps.next_version.outputs.next_release }} git-semver log --conventional-commits ${{ steps.next_version.outputs.next_release }} - name: Create Release Notes with Markdown From 1ec491e76141deac7c6ff9351c916656a618febf Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 13:31:51 -0600 Subject: [PATCH 47/95] fix: fix summary printouts Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index c5276fac6425..9867eebdcdda 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -67,7 +67,7 @@ jobs: # Export to Github output and Github summary echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} - #printf "Build Tag to Release: ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} + printf "Build Tag to Release: ${{ BUILD_TAG }}" >> ${GITHUB_STEP_SUMMARY} - name: Checkout Code id: checkout_code @@ -105,7 +105,7 @@ jobs: run: | echo "BRANCH_NAME=temp/${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_OUTPUT} echo "The temp branch name is: ${BRANCH_NAME}" - printf "The temp branch name for release is: ${BRANCH_NAME}" >> ${GITHUB_STEP_SUMMARY} + printf "The temp branch name for release is: ${{ BRANCH_NAME} }" >> ${GITHUB_STEP_SUMMARY} - name: Create a Temporary Semantic Release Branch run: | From 8cc2659868d8f6b96cb429120078fcba1d63d1fd Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 13:32:49 -0600 Subject: [PATCH 48/95] fix: update Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 9867eebdcdda..0e187efdd57c 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -105,7 +105,7 @@ jobs: run: | echo "BRANCH_NAME=temp/${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_OUTPUT} echo "The temp branch name is: ${BRANCH_NAME}" - printf "The temp branch name for release is: ${{ BRANCH_NAME} }" >> ${GITHUB_STEP_SUMMARY} + printf "The temp branch name for release is: ${{ BRANCH_NAME }}" >> ${GITHUB_STEP_SUMMARY} - name: Create a Temporary Semantic Release Branch run: | From 65851b305357095024506788bc75ecd7210f6d1d Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 13:33:54 -0600 Subject: [PATCH 49/95] fix: fix a problem Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 0e187efdd57c..1b8609d7acc9 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -67,7 +67,7 @@ jobs: # Export to Github output and Github summary echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} - printf "Build Tag to Release: ${{ BUILD_TAG }}" >> ${GITHUB_STEP_SUMMARY} + printf "Build Tag to Release: ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} - name: Checkout Code id: checkout_code From 8eb44245d2cb71890efd15cd762bac691c1ce2d0 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 13:35:10 -0600 Subject: [PATCH 50/95] fix: clean up the summary output Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 1b8609d7acc9..ad967a6b1329 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -105,7 +105,7 @@ jobs: run: | echo "BRANCH_NAME=temp/${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_OUTPUT} echo "The temp branch name is: ${BRANCH_NAME}" - printf "The temp branch name for release is: ${{ BRANCH_NAME }}" >> ${GITHUB_STEP_SUMMARY} + printf "The temp branch name for release is: ${BRANCH_NAME}" >> ${GITHUB_STEP_SUMMARY} - name: Create a Temporary Semantic Release Branch run: | From d567467f95efd6d778a767881153054f6a8a104a Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 13:36:23 -0600 Subject: [PATCH 51/95] fix: remove dry run flag as git-semver does not support dry run Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index ad967a6b1329..a0309355f849 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -22,11 +22,6 @@ on: description: "Build Number (ex: 43 = build_00043)" type: string required: true - dry-run-enabled: - description: "Perform Dry Run" - type: boolean - required: false - default: false defaults: run: From 8b4714690d668a3a9b6b7dd366b45f20c24a555b Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 13:57:03 -0600 Subject: [PATCH 52/95] fix: remove braces from BUILD_TAG to output to github summary Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index a0309355f849..89211f5151da 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -62,7 +62,7 @@ jobs: # Export to Github output and Github summary echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} - printf "Build Tag to Release: ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} + printf "Build Tag to Release: $BUILD_TAG" >> ${GITHUB_STEP_SUMMARY} - name: Checkout Code id: checkout_code From 814ba43bcd35955457dddb5a0908eb92b4325e85 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 14:01:23 -0600 Subject: [PATCH 53/95] fix: Make a new step for the summary output Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 89211f5151da..8900e2fe13ef 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -62,7 +62,11 @@ jobs: # Export to Github output and Github summary echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} - printf "Build Tag to Release: $BUILD_TAG" >> ${GITHUB_STEP_SUMMARY} + + - name: Print Tag To Create a Release From + run: | + echo "We will release the following tag: ${{ steps.validate.outputs.BUILD_TAG }}" + printf "Build Tag to Release: v${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_STEP_SUMMARY} - name: Checkout Code id: checkout_code From d5af8b2766411816cc0f538f315407431c078b4d Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 14:05:30 -0600 Subject: [PATCH 54/95] fix: print temp branch name to summary Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 23 +++++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 8900e2fe13ef..675f8c4e9bb9 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -66,7 +66,7 @@ jobs: - name: Print Tag To Create a Release From run: | echo "We will release the following tag: ${{ steps.validate.outputs.BUILD_TAG }}" - printf "Build Tag to Release: v${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_STEP_SUMMARY} + printf "Build Tag to Release: ${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_STEP_SUMMARY} - name: Checkout Code id: checkout_code @@ -85,14 +85,14 @@ jobs: echo "Checked out branch: $(git symbolic-ref --short HEAD)" fi - - name: Import GPG Key - uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 - with: - git_commit_gpgsign: true - git_tag_gpgsign: true - git_user_signingkey: true - gpg_private_key: ${{ secrets.SVCS_GPG_KEY_CONTENTS }} - passphrase: ${{ secrets.SVCS_GPG_KEY_PASSPHRASE }} +# - name: Import GPG Key +# uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 +# with: +# git_commit_gpgsign: true +# git_tag_gpgsign: true +# git_user_signingkey: true +# gpg_private_key: ${{ secrets.SVCS_GPG_KEY_CONTENTS }} +# passphrase: ${{ secrets.SVCS_GPG_KEY_PASSPHRASE }} - name: Setup Node uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 @@ -106,6 +106,11 @@ jobs: echo "The temp branch name is: ${BRANCH_NAME}" printf "The temp branch name for release is: ${BRANCH_NAME}" >> ${GITHUB_STEP_SUMMARY} + - name: Print Temporary Branch Name + run: | + echo "The temporary branch name is: ${{ steps.branch_name.outputs.BRANCH_NAME }}" + printf "Temporary Branch Name: ${{ steps.branch_name.outputs.BRANCH_NAME }}" >> ${GITHUB_STEP_SUMMARY} + - name: Create a Temporary Semantic Release Branch run: | echo "Going to run the following command:" From e9948d2000ae1c65a7818a4c3a8994e75c75f602 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 14:05:54 -0600 Subject: [PATCH 55/95] fix: remove duplicate printout to summary Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 675f8c4e9bb9..ccdbae49620a 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -104,7 +104,6 @@ jobs: run: | echo "BRANCH_NAME=temp/${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_OUTPUT} echo "The temp branch name is: ${BRANCH_NAME}" - printf "The temp branch name for release is: ${BRANCH_NAME}" >> ${GITHUB_STEP_SUMMARY} - name: Print Temporary Branch Name run: | From 1468b01f85c437e02236c33ed6ba8a3ee56b2555 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 14:09:07 -0600 Subject: [PATCH 56/95] fix: uncomment import gpg key step Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index ccdbae49620a..f30d4880c716 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -85,14 +85,14 @@ jobs: echo "Checked out branch: $(git symbolic-ref --short HEAD)" fi -# - name: Import GPG Key -# uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 -# with: -# git_commit_gpgsign: true -# git_tag_gpgsign: true -# git_user_signingkey: true -# gpg_private_key: ${{ secrets.SVCS_GPG_KEY_CONTENTS }} -# passphrase: ${{ secrets.SVCS_GPG_KEY_PASSPHRASE }} + - name: Import GPG Key + uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 + with: + git_commit_gpgsign: true + git_tag_gpgsign: true + git_user_signingkey: true + gpg_private_key: ${{ secrets.SVCS_GPG_KEY_CONTENTS }} + passphrase: ${{ secrets.SVCS_GPG_KEY_PASSPHRASE }} - name: Setup Node uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 From e8370cab3383a55eef3f457d0ec69fe954f4c990 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 14:14:42 -0600 Subject: [PATCH 57/95] fix: try something else for summary Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index f30d4880c716..9507a79c9da5 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -62,6 +62,7 @@ jobs: # Export to Github output and Github summary echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} + echo "Build Tag to Release (Step Process Input): ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} - name: Print Tag To Create a Release From run: | @@ -85,6 +86,9 @@ jobs: echo "Checked out branch: $(git symbolic-ref --short HEAD)" fi + # TODO: Configure + # git config --global user.email "you@example.com" + # git config --global user.name "Your Name" - name: Import GPG Key uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 with: @@ -148,7 +152,7 @@ jobs: - name: Apply Tag with Calculated Next Version run: | echo "Applying computed version tag" - git tag -a v${{ steps.next_version.outputs.next_release }} -m "v${{ steps.next_version.outputs.next_release }}" + git tag --annotate v${{ steps.next_version.outputs.next_release }} --message "v${{ steps.next_version.outputs.next_release }}" echo "Applied tag v${{ steps.next_version.outputs.next_release }}" printf "Version Tag Applied: v${{ steps.next_version.outputs.next_release }}" >> ${GITHUB_STEP_SUMMARY} From 9141eeff47cf29d306111bc82ac7887bfaf61ccc Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 14:19:23 -0600 Subject: [PATCH 58/95] fix: print out Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 9507a79c9da5..ff6fd503ea81 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -62,7 +62,7 @@ jobs: # Export to Github output and Github summary echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} - echo "Build Tag to Release (Step Process Input): ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} + echo "Build Tag to Release (Step Process Input): "${BUILD_TAG} >> ${GITHUB_STEP_SUMMARY} - name: Print Tag To Create a Release From run: | From 6531876e39adf6053e2c1796bf4a8eb292bf36b8 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 14:24:07 -0600 Subject: [PATCH 59/95] fix: try one other thing for summary Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index ff6fd503ea81..6c887ab0d604 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -61,8 +61,9 @@ jobs: echo "Prefixed number is: $build_tag" # Export to Github output and Github summary + BUILD_TAG=BUILD_TAG=$build_tag echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} - echo "Build Tag to Release (Step Process Input): "${BUILD_TAG} >> ${GITHUB_STEP_SUMMARY} + echo "Build Tag to Release (Step Process Input): ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} - name: Print Tag To Create a Release From run: | From d97718dd0f333dc6c6416ebffa881785a4f0f8d7 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 14:29:22 -0600 Subject: [PATCH 60/95] fix: clean up duplicate Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 6c887ab0d604..0b7e5d106567 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -61,7 +61,7 @@ jobs: echo "Prefixed number is: $build_tag" # Export to Github output and Github summary - BUILD_TAG=BUILD_TAG=$build_tag + BUILD_TAG=$build_tag echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} echo "Build Tag to Release (Step Process Input): ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} From a1de1c50f5dc6a92847d1b6d30a449d510a01c53 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 14:47:09 -0600 Subject: [PATCH 61/95] fix: hopefully final cleanup step on summary output Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 0b7e5d106567..b3884a4b7449 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -63,12 +63,7 @@ jobs: # Export to Github output and Github summary BUILD_TAG=$build_tag echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} - echo "Build Tag to Release (Step Process Input): ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} - - - name: Print Tag To Create a Release From - run: | - echo "We will release the following tag: ${{ steps.validate.outputs.BUILD_TAG }}" - printf "Build Tag to Release: ${{ steps.validate.outputs.BUILD_TAG }}" >> ${GITHUB_STEP_SUMMARY} + echo "Build Tag to Release: ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} - name: Checkout Code id: checkout_code From 9a65b943ab8edfafd5968cbb86abaa6828f85520 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 14:54:17 -0600 Subject: [PATCH 62/95] fix: replace printf with echo Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index b3884a4b7449..b08546b1138e 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -108,7 +108,7 @@ jobs: - name: Print Temporary Branch Name run: | echo "The temporary branch name is: ${{ steps.branch_name.outputs.BRANCH_NAME }}" - printf "Temporary Branch Name: ${{ steps.branch_name.outputs.BRANCH_NAME }}" >> ${GITHUB_STEP_SUMMARY} + echo "Temporary Branch Name: ${{ steps.branch_name.outputs.BRANCH_NAME }}" >> ${GITHUB_STEP_SUMMARY} - name: Create a Temporary Semantic Release Branch run: | @@ -143,14 +143,14 @@ jobs: echo "Compute next version number using git-semver" echo "next_release=$(git-semver next --stable=false)" >> ${GITHUB_OUTPUT} echo "Next release version is: ${next_release}" - #printf "Next Release Version Number: ${next_release}" >> ${GITHUB_STEP_SUMMARY} + echo "Next Release Version Number: ${next_release}" >> ${GITHUB_STEP_SUMMARY} - name: Apply Tag with Calculated Next Version run: | echo "Applying computed version tag" git tag --annotate v${{ steps.next_version.outputs.next_release }} --message "v${{ steps.next_version.outputs.next_release }}" echo "Applied tag v${{ steps.next_version.outputs.next_release }}" - printf "Version Tag Applied: v${{ steps.next_version.outputs.next_release }}" >> ${GITHUB_STEP_SUMMARY} + echo "Version Tag Applied: v${{ steps.next_version.outputs.next_release }}" >> ${GITHUB_STEP_SUMMARY} - name: Identify Current Version Number After Tagging run: | @@ -206,8 +206,8 @@ jobs: echo "Deleting the temporary semantic release branch" echo "Deleting local branch now:" git branch -d ${{ steps.branch_name.outputs.BRANCH_NAME }} - printf "Deleted Temporary Branch from Local Runner\n" >> ${GITHUB_STEP_SUMMARY} + echo "Deleted Temporary Branch from Local Runner\n" >> ${GITHUB_STEP_SUMMARY} echo "Deleting remote branch now:" git push -d origin ${{ steps.branch_name.outputs.BRANCH_NAME }} - printf "Deleted Temporary Branch from Remote" >> ${GITHUB_STEP_SUMMARY} + echo "Deleted Temporary Branch from Remote" >> ${GITHUB_STEP_SUMMARY} From 972f5cf131dece5519a9835af64cbfa3abb1f4c4 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 15:14:51 -0600 Subject: [PATCH 63/95] fix: remove extra summary print Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index b08546b1138e..dcf6ce848ac8 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -143,7 +143,6 @@ jobs: echo "Compute next version number using git-semver" echo "next_release=$(git-semver next --stable=false)" >> ${GITHUB_OUTPUT} echo "Next release version is: ${next_release}" - echo "Next Release Version Number: ${next_release}" >> ${GITHUB_STEP_SUMMARY} - name: Apply Tag with Calculated Next Version run: | @@ -206,7 +205,7 @@ jobs: echo "Deleting the temporary semantic release branch" echo "Deleting local branch now:" git branch -d ${{ steps.branch_name.outputs.BRANCH_NAME }} - echo "Deleted Temporary Branch from Local Runner\n" >> ${GITHUB_STEP_SUMMARY} + echo "Deleted Temporary Branch from Local Runner" >> ${GITHUB_STEP_SUMMARY} echo "Deleting remote branch now:" git push -d origin ${{ steps.branch_name.outputs.BRANCH_NAME }} From bd62eb8656c71f452a14362301a9d7c1b98ed0a8 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 15:17:50 -0600 Subject: [PATCH 64/95] fix: cleanup before merging Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index dcf6ce848ac8..2ba63c5439d0 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -158,10 +158,7 @@ jobs: echo "Current version is: ${current_version}" echo "Should match version we just applied: ${{ steps.next_version.outputs.next_release }}" - - name: Create Release Notes with Conventional Commits - run: | - echo git-semver log --conventional-commits ${{ steps.next_version.outputs.next_release }} - git-semver log --conventional-commits ${{ steps.next_version.outputs.next_release }} + # TODO: Push the new tag to remote - name: Create Release Notes with Markdown run: | @@ -177,7 +174,7 @@ jobs: - name: View Status After Running Semantic Release run: git status - # TODO: Remove this delete step before merging to mainline + # TODO: Remove delete tag step before merging to mainline (we want to keep the new tag) - name: Delete Created Tag if: always() run: | From b492f3d99f2461ae1cd64685cb42c70eefcc9cd2 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 15:32:55 -0600 Subject: [PATCH 65/95] fix: add standard braces for shell expansions Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 2ba63c5439d0..6b3bf34d12fa 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -54,15 +54,15 @@ jobs: # 5-digit padding padded_number=$(printf "%05d" ${{ inputs.build_number }}) - echo "Padded number is: $padded_number" + echo "Padded number is: ${padded_number}" # Add "build_" prefix to the padded number - build_tag="build-$padded_number" - echo "Prefixed number is: $build_tag" + build_tag="build-${padded_number}" + echo "Prefixed number is: ${build_tag}" # Export to Github output and Github summary - BUILD_TAG=$build_tag - echo "BUILD_TAG=$build_tag" >> ${GITHUB_OUTPUT} + BUILD_TAG=${build_tag} + echo "BUILD_TAG=${build_tag}" >> ${GITHUB_OUTPUT} echo "Build Tag to Release: ${BUILD_TAG}" >> ${GITHUB_STEP_SUMMARY} - name: Checkout Code @@ -119,7 +119,7 @@ jobs: - name: Echo Current Branch Name run: | current_branch=$(git symbolic-ref --short HEAD) - echo "Currently on branch: $current_branch" + echo "Currently on branch: ${current_branch}" - name: Push Temporary Branch to Origin run: | @@ -158,7 +158,11 @@ jobs: echo "Current version is: ${current_version}" echo "Should match version we just applied: ${{ steps.next_version.outputs.next_release }}" - # TODO: Push the new tag to remote +# TODO: Comment out before merge +# - name: Push Release Tag to Remote +# run: | +# echo "Pushing release tag to remote" +# git push origin tag v${{ steps.next_version.outputs.next_release }} - name: Create Release Notes with Markdown run: | From fc084c1d2c05e3092b99aea5755e56cbc2e64a23 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 15:57:15 -0600 Subject: [PATCH 66/95] fix: push new tag to remote Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 6b3bf34d12fa..6ffc6fc6d772 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -82,9 +82,6 @@ jobs: echo "Checked out branch: $(git symbolic-ref --short HEAD)" fi - # TODO: Configure - # git config --global user.email "you@example.com" - # git config --global user.name "Your Name" - name: Import GPG Key uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 with: @@ -159,10 +156,11 @@ jobs: echo "Should match version we just applied: ${{ steps.next_version.outputs.next_release }}" # TODO: Comment out before merge -# - name: Push Release Tag to Remote -# run: | -# echo "Pushing release tag to remote" -# git push origin tag v${{ steps.next_version.outputs.next_release }} + - name: Push Release Tag to Remote + run: | + echo "Pushing release tag to remote" + git push origin tag v${{ steps.next_version.outputs.next_release }} + echo "Pushed new release tag to remote" - name: Create Release Notes with Markdown run: | @@ -183,6 +181,7 @@ jobs: if: always() run: | git tag --delete v${{ steps.next_version.outputs.next_release }} + git push --delete origin v${{ steps.next_version.outputs.next_release }} - name: Ensure Branch Not in Use and Delete Worktree if: always() From 33b5f2ee05e58b3885a3dfa429cb2663e1f547c5 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 16:00:20 -0600 Subject: [PATCH 67/95] fix: final cleanup Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 6ffc6fc6d772..75cc46ca9d0c 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -155,7 +155,6 @@ jobs: echo "Current version is: ${current_version}" echo "Should match version we just applied: ${{ steps.next_version.outputs.next_release }}" -# TODO: Comment out before merge - name: Push Release Tag to Remote run: | echo "Pushing release tag to remote" From 2e7555669c70970fdce5451c003d02d45fa836e9 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 16:00:47 -0600 Subject: [PATCH 68/95] fix: spotless Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 75cc46ca9d0c..82eb73a35705 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -187,10 +187,10 @@ jobs: run: | # Switch to main git checkout main - + # Check if the branch is associated with a worktree and remove the worktree if it exists worktree_path=$(git worktree list | grep ${{ steps.branch_name.outputs.BRANCH_NAME }} || true) - + if [ -n "$worktree_path" ]; then echo "Removing worktree at $worktree_path" git worktree remove "$worktree_path" @@ -205,7 +205,7 @@ jobs: echo "Deleting local branch now:" git branch -d ${{ steps.branch_name.outputs.BRANCH_NAME }} echo "Deleted Temporary Branch from Local Runner" >> ${GITHUB_STEP_SUMMARY} - + echo "Deleting remote branch now:" git push -d origin ${{ steps.branch_name.outputs.BRANCH_NAME }} echo "Deleted Temporary Branch from Remote" >> ${GITHUB_STEP_SUMMARY} From dddfced87d7d2465e34288279f4431455091e41c Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 21 Jan 2025 16:01:20 -0600 Subject: [PATCH 69/95] fix: remove delete tag step Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 82eb73a35705..c0f6830fce47 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -175,13 +175,6 @@ jobs: - name: View Status After Running Semantic Release run: git status - # TODO: Remove delete tag step before merging to mainline (we want to keep the new tag) - - name: Delete Created Tag - if: always() - run: | - git tag --delete v${{ steps.next_version.outputs.next_release }} - git push --delete origin v${{ steps.next_version.outputs.next_release }} - - name: Ensure Branch Not in Use and Delete Worktree if: always() run: | From 554eda89cb7c8fed200f1862eb30cea56b0b492a Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Thu, 23 Jan 2025 13:38:09 -0600 Subject: [PATCH 70/95] Update .github/workflows/flow-trigger-release.yaml Co-authored-by: Roger Barker Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index c0f6830fce47..c92cd3f4b650 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -42,7 +42,7 @@ jobs: with: egress-policy: audit - - name: Process, Validate, and Pad Build Input + - name: Build Input Validation id: validate run: | echo "The input is ${{ inputs.build_number }}" From a781dc635de6b0759b15880415d2751384eaf0e4 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Thu, 23 Jan 2025 13:39:54 -0600 Subject: [PATCH 71/95] Update .github/workflows/flow-trigger-release.yaml Co-authored-by: Roger Barker Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index c92cd3f4b650..10ff75282362 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -73,14 +73,6 @@ jobs: ref: ${{ steps.validate.outputs.BUILD_TAG }} token: ${{ secrets.GH_ACCESS_TOKEN }} - - name: Display Current Branch or Tag - run: | - # Check if it's a tag - if git describe --exact-match --tags >/dev/null 2>&1; then - echo "Checked out tag: $(git describe --exact-match --tags)" - else - echo "Checked out branch: $(git symbolic-ref --short HEAD)" - fi - name: Import GPG Key uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 From 3aabe7809794df6f08e7c00e7ecb3ac09bd85bd0 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Thu, 23 Jan 2025 13:40:03 -0600 Subject: [PATCH 72/95] Update .github/workflows/flow-trigger-release.yaml Co-authored-by: Roger Barker Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 10ff75282362..f1e823a68aa9 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -101,7 +101,6 @@ jobs: - name: Create a Temporary Semantic Release Branch run: | - echo "Going to run the following command:" echo "git checkout -b ${{ steps.branch_name.outputs.BRANCH_NAME }}" git checkout -b ${{ steps.branch_name.outputs.BRANCH_NAME }} From 30e5ed3dc4f031747a3136c39ec96c52d780a878 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Thu, 23 Jan 2025 13:40:15 -0600 Subject: [PATCH 73/95] Update .github/workflows/flow-trigger-release.yaml Co-authored-by: Roger Barker Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index f1e823a68aa9..eb709d405143 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -137,14 +137,9 @@ jobs: echo "Applying computed version tag" git tag --annotate v${{ steps.next_version.outputs.next_release }} --message "v${{ steps.next_version.outputs.next_release }}" echo "Applied tag v${{ steps.next_version.outputs.next_release }}" - echo "Version Tag Applied: v${{ steps.next_version.outputs.next_release }}" >> ${GITHUB_STEP_SUMMARY} - - - name: Identify Current Version Number After Tagging - run: | - echo "Find the current version number after we applied the new tag" current_version=$(git-semver latest) - echo "Current version is: ${current_version}" - echo "Should match version we just applied: ${{ steps.next_version.outputs.next_release }}" + echo "Version Tag Applied: v${{ steps.next_version.outputs.next_release }}" >> ${GITHUB_STEP_SUMMARY} + echo "Current version is: ${current_version}" >> ${GITHUB_STEP_SUMMARY} - name: Push Release Tag to Remote run: | From b0a1f751afb1780a5b1155502ab51ae841375ba2 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Thu, 23 Jan 2025 13:40:36 -0600 Subject: [PATCH 74/95] Update .github/workflows/flow-trigger-release.yaml Co-authored-by: Roger Barker Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index eb709d405143..6e9c73df7147 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -155,7 +155,7 @@ jobs: - name: Clean Up git-semver run: | echo "Deleting git-semver directory" - rm -rf git-semver + rm -rf ./git-semver echo "Successfully removed git-semver directory" - name: View Status After Running Semantic Release From 8f6ec6cc03cacb090cf1dd125b538b4bfb02ee9b Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Thu, 23 Jan 2025 13:40:42 -0600 Subject: [PATCH 75/95] Update .github/workflows/increment-next-main-release.yaml Co-authored-by: Roger Barker Signed-off-by: Andrew Brandt --- .github/workflows/increment-next-main-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/increment-next-main-release.yaml b/.github/workflows/increment-next-main-release.yaml index 6420d78da53b..de25153f68c6 100644 --- a/.github/workflows/increment-next-main-release.yaml +++ b/.github/workflows/increment-next-main-release.yaml @@ -95,7 +95,7 @@ jobs: new_version="${new_version}-SNAPSHOT" echo "New version: ${new_version}" - echo "new_version=${new_version}" >> ${GITHUB_OUTPUT} + echo "new-version=${new_version}" >> ${GITHUB_OUTPUT} printf "New Version: ${new_version}" >> ${GITHUB_STEP_SUMMARY} - name: Update version.txt From ba3fa11c090e8bc65bc0eb986204d7d9c642608b Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Thu, 23 Jan 2025 13:40:52 -0600 Subject: [PATCH 76/95] Update .github/workflows/increment-next-main-release.yaml Co-authored-by: Roger Barker Signed-off-by: Andrew Brandt --- .github/workflows/increment-next-main-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/increment-next-main-release.yaml b/.github/workflows/increment-next-main-release.yaml index de25153f68c6..c6784f05aa5e 100644 --- a/.github/workflows/increment-next-main-release.yaml +++ b/.github/workflows/increment-next-main-release.yaml @@ -104,7 +104,7 @@ jobs: - name: Publish to Maven Central run: | - ./gradlew versionAsSpecified -PnewVersion=${{ steps.increment_version.outputs.new_version }} + ./gradlew versionAsSpecified -PnewVersion=${{ steps.increment_version.outputs.new-version }} - name: Add & Commit uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4 From 1cfd414b6bb318463bb7d9ffad1ccda84da9d6cf Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Thu, 23 Jan 2025 13:42:37 -0600 Subject: [PATCH 77/95] fix: add comments for why we need to use semantic release temp branch Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 6e9c73df7147..b0e57e47acba 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -73,7 +73,6 @@ jobs: ref: ${{ steps.validate.outputs.BUILD_TAG }} token: ${{ secrets.GH_ACCESS_TOKEN }} - - name: Import GPG Key uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 with: @@ -99,6 +98,8 @@ jobs: echo "The temporary branch name is: ${{ steps.branch_name.outputs.BRANCH_NAME }}" echo "Temporary Branch Name: ${{ steps.branch_name.outputs.BRANCH_NAME }}" >> ${GITHUB_STEP_SUMMARY} + # Need to create a temporary branch so we can use the git-semver tool to create a release. + # Semantic versioning only works off branches, not tags. - name: Create a Temporary Semantic Release Branch run: | echo "git checkout -b ${{ steps.branch_name.outputs.BRANCH_NAME }}" @@ -139,7 +140,7 @@ jobs: echo "Applied tag v${{ steps.next_version.outputs.next_release }}" current_version=$(git-semver latest) echo "Version Tag Applied: v${{ steps.next_version.outputs.next_release }}" >> ${GITHUB_STEP_SUMMARY} - echo "Current version is: ${current_version}" >> ${GITHUB_STEP_SUMMARY} + echo "Current version is: ${current_version}" >> ${GITHUB_STEP_SUMMARY} - name: Push Release Tag to Remote run: | From ce52413623262e4e02cf3bc4e0c57863d606b15a Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 08:41:50 -0600 Subject: [PATCH 78/95] fix: rename next main release file Signed-off-by: Andrew Brandt --- ...xt-main-release.yaml => flow-increment-next-main-release.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{increment-next-main-release.yaml => flow-increment-next-main-release.yaml} (100%) diff --git a/.github/workflows/increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml similarity index 100% rename from .github/workflows/increment-next-main-release.yaml rename to .github/workflows/flow-increment-next-main-release.yaml From d0a6f9b827e4b879759ca85d14d634b8840df52f Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:04:40 -0600 Subject: [PATCH 79/95] Update .github/workflows/flow-increment-next-main-release.yaml Co-authored-by: Nathan Klick Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index c6784f05aa5e..1e7706e75048 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -102,7 +102,7 @@ jobs: run: | echo ${{ steps.increment_version.outputs.new_version }} > version.txt - - name: Publish to Maven Central + - name: Update Versions run: | ./gradlew versionAsSpecified -PnewVersion=${{ steps.increment_version.outputs.new-version }} From 20c7db58c987e115c5eee1d225dc788863ac4b35 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:04:50 -0600 Subject: [PATCH 80/95] Update .github/workflows/flow-increment-next-main-release.yaml Co-authored-by: Nathan Klick Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index 1e7706e75048..8e630595bc2f 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -25,7 +25,6 @@ defaults: permissions: id-token: write contents: write - actions: write issues: write jobs: From 59ea4a2d207cf43cdbfa567a4f0ef6c9674565fa Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:04:59 -0600 Subject: [PATCH 81/95] Update .github/workflows/flow-increment-next-main-release.yaml Co-authored-by: Nathan Klick Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index 8e630595bc2f..bbf75639bbe9 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -25,7 +25,6 @@ defaults: permissions: id-token: write contents: write - issues: write jobs: next-main-release: From ae3725a0f4c0c07ec3b44d3129ee5e1d6c51a32c Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:05:16 -0600 Subject: [PATCH 82/95] Update .github/workflows/flow-trigger-release.yaml Co-authored-by: Nathan Klick Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index b0e57e47acba..c435c9e16261 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -19,7 +19,7 @@ on: workflow_dispatch: inputs: build_number: - description: "Build Number (ex: 43 = build_00043)" + description: "Build Number (ex: 43 = build_00043):" type: string required: true From 1278747554cde206ec79c767d876e951e0e4aa04 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:05:25 -0600 Subject: [PATCH 83/95] Update .github/workflows/flow-trigger-release.yaml Co-authored-by: Nathan Klick Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index c435c9e16261..1042349ca412 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -102,7 +102,7 @@ jobs: # Semantic versioning only works off branches, not tags. - name: Create a Temporary Semantic Release Branch run: | - echo "git checkout -b ${{ steps.branch_name.outputs.BRANCH_NAME }}" + set -x git checkout -b ${{ steps.branch_name.outputs.BRANCH_NAME }} - name: Echo Current Branch Name From b86c3f074568ef3b012ca388fef4c194c67636dd Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:05:38 -0600 Subject: [PATCH 84/95] Update .github/workflows/flow-increment-next-main-release.yaml Co-authored-by: Nathan Klick Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index bbf75639bbe9..81999a6e9a6a 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -23,7 +23,6 @@ defaults: shell: bash permissions: - id-token: write contents: write jobs: From af44e3f5ff4b9f712f4ff5554a2083d2178e70ca Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:05:46 -0600 Subject: [PATCH 85/95] Update .github/workflows/flow-increment-next-main-release.yaml Co-authored-by: Nathan Klick Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index 81999a6e9a6a..fe75a62d303c 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -23,7 +23,7 @@ defaults: shell: bash permissions: - contents: write + contents: read jobs: next-main-release: From 55414ddb3dd0c4a700f26fcb3259650d84d7c596 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:09:51 -0600 Subject: [PATCH 86/95] fix: remove setup node, remove update version.txt, and add version number to commit message Signed-off-by: Andrew Brandt --- .../workflows/flow-increment-next-main-release.yaml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index fe75a62d303c..bbf8020ea11b 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -35,11 +35,6 @@ jobs: with: egress-policy: audit - - name: Setup Node - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 - with: - node-version: 20 - - name: Checkout Code id: checkout_code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -95,10 +90,6 @@ jobs: echo "new-version=${new_version}" >> ${GITHUB_OUTPUT} printf "New Version: ${new_version}" >> ${GITHUB_STEP_SUMMARY} - - name: Update version.txt - run: | - echo ${{ steps.increment_version.outputs.new_version }} > version.txt - - name: Update Versions run: | ./gradlew versionAsSpecified -PnewVersion=${{ steps.increment_version.outputs.new-version }} @@ -110,4 +101,4 @@ jobs: author_name: ${{ secrets.SVCS_GIT_USER_NAME }} author_email: ${{ secrets.SVCS_GIT_USER_EMAIL }} commit: --signoff - message: "chore: Minor Version Roll" + message: "chore: Minor Version Roll to ${{ steps.increment_version.outputs.new-version }}" From 0b98197703efeeda04dcd5c796bc46a5cf6e6073 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:36:06 -0600 Subject: [PATCH 87/95] fix: change to private branch instead of main for testing Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index bbf8020ea11b..3e3db1008bfa 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -40,7 +40,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: "0" - ref: main + ref: 14967-git-semver-test-branch token: ${{ secrets.GH_ACCESS_TOKEN }} - name: Import GPG Key From 4f28d64f616ad29483eb7d2ae5815adcc6b0ce82 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:53:18 -0600 Subject: [PATCH 88/95] fix: break workflow Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index 3e3db1008bfa..b41aab829498 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -15,6 +15,7 @@ ## name: "[Main] Prepare Next Release Version" +BREAK on: workflow_dispatch: From 9ae9425be43b800441a8c26f925cbec25068cef7 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 17:54:18 -0600 Subject: [PATCH 89/95] fix: fix workflow Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index b41aab829498..3e3db1008bfa 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -15,7 +15,6 @@ ## name: "[Main] Prepare Next Release Version" -BREAK on: workflow_dispatch: From b8be682a83e7ee278a3cbbdf7d45b2e723e717f4 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 18:49:42 -0600 Subject: [PATCH 90/95] fix: add setup gradle step Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index 3e3db1008bfa..36ef4639e75f 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -43,6 +43,11 @@ jobs: ref: 14967-git-semver-test-branch token: ${{ secrets.GH_ACCESS_TOKEN }} + - name: Setup Gradle + uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0 + with: + cache-disabled: true + - name: Import GPG Key id: gpg_importer uses: step-security/ghaction-import-gpg@6c8fe4d0126a59d57c21f87c9ae5dd3451fa3cca # v6.1.0 From 5332d31dd8a96d7cc083de2bf42e9557cd07fa43 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 18:52:06 -0600 Subject: [PATCH 91/95] fix: add setup java step Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index 36ef4639e75f..14ffb54f469f 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -43,6 +43,12 @@ jobs: ref: 14967-git-semver-test-branch token: ${{ secrets.GH_ACCESS_TOKEN }} + - name: Setup Java + uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0 + with: + distribution: "temurin" + java-version: "21.0.4" + - name: Setup Gradle uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0 with: From 20e9563292edefd3834a357e39dd97860e165341 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 19:02:01 -0600 Subject: [PATCH 92/95] fix: change minor version roll script back to main branch Signed-off-by: Andrew Brandt --- .github/workflows/flow-increment-next-main-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-increment-next-main-release.yaml b/.github/workflows/flow-increment-next-main-release.yaml index 14ffb54f469f..c2a0cebdd0e1 100644 --- a/.github/workflows/flow-increment-next-main-release.yaml +++ b/.github/workflows/flow-increment-next-main-release.yaml @@ -40,7 +40,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: "0" - ref: 14967-git-semver-test-branch + ref: main token: ${{ secrets.GH_ACCESS_TOKEN }} - name: Setup Java From cbdf39042679f916c54e11fb05cdf2cf5dca1969 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Fri, 31 Jan 2025 21:58:05 -0600 Subject: [PATCH 93/95] fix: propogate error from git-semver correctly on fail Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 1042349ca412..0748d8d31841 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -130,8 +130,14 @@ jobs: id: next_version run: | echo "Compute next version number using git-semver" - echo "next_release=$(git-semver next --stable=false)" >> ${GITHUB_OUTPUT} - echo "Next release version is: ${next_release}" + OUTPUT=$(git-semver next --stable=false 2>&1) || STATUS=$? + echo "$OUTPUT" + if [[ -n "$STATUS" ]]; then + echo "git-semver failed with status $STATUS" + exit $STATUS + fi + echo "next_release=$OUTPUT" >> ${GITHUB_OUTPUT} + echo "Next release version is: $OUTPUT" - name: Apply Tag with Calculated Next Version run: | From 9f847cd11f6d97d92b35d20fa1d121b69d869402 Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Tue, 4 Feb 2025 14:27:23 -0600 Subject: [PATCH 94/95] fix: update to new version of git semver action Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 0748d8d31841..805676782b42 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -116,7 +116,7 @@ jobs: git push --set-upstream origin ${{ steps.branch_name.outputs.BRANCH_NAME }} - name: Git-Semver Setup Action - uses: DJ-BBot/setup-git-semver@7ede9a8b0c0f4cfff14e9b0a8771dbc546f2b76b # v1.0.1 + uses: DJ-BBot/setup-git-semver@91baf2ca207495aa35db3441038ddeae2b6904c7 # v1.0.2 - name: Identify Current Version Number run: | From ba0ba141d2a9bc9dca50ecee2e7e2925087b4c3b Mon Sep 17 00:00:00 2001 From: Andrew Brandt Date: Wed, 12 Feb 2025 13:21:19 -0600 Subject: [PATCH 95/95] fix: typo in input Signed-off-by: Andrew Brandt --- .github/workflows/flow-trigger-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flow-trigger-release.yaml b/.github/workflows/flow-trigger-release.yaml index 805676782b42..569e8098a14c 100644 --- a/.github/workflows/flow-trigger-release.yaml +++ b/.github/workflows/flow-trigger-release.yaml @@ -19,7 +19,7 @@ on: workflow_dispatch: inputs: build_number: - description: "Build Number (ex: 43 = build_00043):" + description: "Build Number (ex: 43 = build-00043):" type: string required: true