From a60aa76f98a964bfef0a7c3736909c931611e146 Mon Sep 17 00:00:00 2001 From: Scott Date: Sat, 27 Jan 2024 22:58:03 -0500 Subject: [PATCH 01/21] ci: add release.yml to help automate release versions --- .github/workflows/release.yml | 90 +++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..696403d --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,90 @@ +name: Bump release version +on: + pull_request: + branches: [rolling] + types: + - closed + +permissions: + contents: write + +concurrency: production + +jobs: + build: + name: Create Release + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + steps: + - name: Taking the Latest Release Tag number + id: releaseVersion + run: | + repo="${{ github.repository }}" + release_json=$(curl -s "https://api.github.com/repos/$repo/releases") + + if [ "$(echo "$release_json" | jq '. | length')" -eq 0 ]; then + Release_tag="0.1.0" + echo "No releases found. Setting default version to $Release_tag" + else + Release_tag=$(echo "$release_json" | jq -r '.[0].tag_name') + echo "Latest Tag is : $Release_tag" + fi + + echo "::set-output name=Release_tag::$Release_tag" + + - name: Checkout code + uses: actions/checkout@v2 + + - name: Bumping Major Index + id: bump_version_major + if: contains(github.event.pull_request.title, 'major') + uses: christian-draeger/increment-semantic-version@1.1.0 + with: + current-version: ${{ steps.releaseVersion.outputs.Release_tag }} + version-fragment: 'major' + + - name: Bumping Minor Index + id: bump_version_minor + if: contains(github.event.pull_request.title, 'feat') + + uses: christian-draeger/increment-semantic-version@1.1.0 + with: + current-version: ${{ steps.releaseVersion.outputs.Release_tag }} + version-fragment: 'feature' + + - name: Bumping Patch Index + id: bump_version_patch + if: | + ${{ contains(github.event.pull_request.title, 'patch') || + contains(github.event.pull_request.title, 'build') || + contains(github.event.pull_request.title, 'chore') || + contains(github.event.pull_request.title, 'ci') || + contains(github.event.pull_request.title, 'docs') || + contains(github.event.pull_request.title, 'style') || + contains(github.event.pull_request.title, 'refactor') || + contains(github.event.pull_request.title, 'perf') || + contains(github.event.pull_request.title, 'test') }} + uses: christian-draeger/increment-semantic-version@1.1.0 + with: + current-version: ${{ steps.releaseVersion.outputs.Release_tag }} + version-fragment: 'bug' + + - name: Create release version for bump_version_major + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + create_release() { + curl \ + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + https://api.github.com/repos/${repo}/releases \ + -d '{"tag_name":"'"${1}"'","target_commitish":"'"${branch}"'","name":"'"${1}"'","body":"","draft":false,"prerelease":false,"generate_release_notes":true}' + } + + repo=${{ github.repository }} + branch=${{ github.head_ref }} + + create_release "${{ steps.bump_version_major.outputs.next-version }}" + create_release "${{ steps.bump_version_minor.outputs.next-version }}" + create_release "${{ steps.bump_version_patch.outputs.next-version }}" \ No newline at end of file From fbd2154ab86a4a085da29a34adb4db91f9c40b35 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 00:07:05 -0500 Subject: [PATCH 02/21] ci: add release.yml to help automate release versions - edited file further to cover edge cases --- .github/workflows/release.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 696403d..1830b5c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,14 +20,25 @@ jobs: id: releaseVersion run: | repo="${{ github.repository }}" - release_json=$(curl -s "https://api.github.com/repos/$repo/releases") + latest_release=$(curl -s "https://api.github.com/repos/$repo/releases" | jq -r '.[0].name' ) + latest_tag=$(curl -s "https://api.github.com/repos/$repo/tags" | jq -r '.[0].tag_name') + - if [ "$(echo "$release_json" | jq '. | length')" -eq 0 ]; then - Release_tag="0.1.0" - echo "No releases found. Setting default version to $Release_tag" + if [ -z "$latest_release" ] && [ -z "$latest_tag" ]; then + echo "No releases or tags found. Setting default version to 0.1.0" + Release_tag="v0.1.0" + elif [ -z "$latest_release" ]; then + echo "No releases found. Using latest tag version." + Release_tag=$latest_release + elif [ -z "$latest_tag" ]; then + echo "No tags found. Using latest release version." + Release_tag=$latest_release + elif [[ "$latest_release" > "$latest_tag" ]]; then + echo "Latest release is newer. Using release version." + Release_tag=$latest_tag else - Release_tag=$(echo "$release_json" | jq -r '.[0].tag_name') - echo "Latest Tag is : $Release_tag" + echo "Latest tag is newer. Using tag version." + Release_tag=$latest_tag fi echo "::set-output name=Release_tag::$Release_tag" From a945c00340c149d888b8e266bd1d8bdcc7fa0c55 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 00:17:39 -0500 Subject: [PATCH 03/21] ci: add release.yml to help automate release versions - I had a typo in a line which pointed at a different variable --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1830b5c..21814df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: Release_tag=$latest_release elif [[ "$latest_release" > "$latest_tag" ]]; then echo "Latest release is newer. Using release version." - Release_tag=$latest_tag + Release_tag=$latest_release else echo "Latest tag is newer. Using tag version." Release_tag=$latest_tag @@ -98,4 +98,4 @@ jobs: create_release "${{ steps.bump_version_major.outputs.next-version }}" create_release "${{ steps.bump_version_minor.outputs.next-version }}" - create_release "${{ steps.bump_version_patch.outputs.next-version }}" \ No newline at end of file + create_release "${{ steps.bump_version_patch.outputs.next-version }}" From 6b75b41083359aa3728186ec1ea95c441294bed1 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 00:27:44 -0500 Subject: [PATCH 04/21] ci: add release.yml to help automate release versions - Fixing the release portion to prepend a v --- .github/workflows/release.yml | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 21814df..1681e04 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: Release_tag="v0.1.0" elif [ -z "$latest_release" ]; then echo "No releases found. Using latest tag version." - Release_tag=$latest_release + Release_tag=$latest_tag elif [ -z "$latest_tag" ]; then echo "No tags found. Using latest release version." Release_tag=$latest_release @@ -85,17 +85,30 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | create_release() { - curl \ - -X POST \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ - https://api.github.com/repos/${repo}/releases \ - -d '{"tag_name":"'"${1}"'","target_commitish":"'"${branch}"'","name":"'"${1}"'","body":"","draft":false,"prerelease":false,"generate_release_notes":true}' + local version="${1}" + if [ -n "${version}" ]; then + version="V${version}" + fi + curl \ + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + https://api.github.com/repos/${repo}/releases \ + -d '{"tag_name":"'"${version}"'","target_commitish":"'"${branch}"'","name":"'"${version}"'","body":"","draft":false,"prerelease":false,"generate_release_notes":true}' } repo=${{ github.repository }} branch=${{ github.head_ref }} - - create_release "${{ steps.bump_version_major.outputs.next-version }}" - create_release "${{ steps.bump_version_minor.outputs.next-version }}" - create_release "${{ steps.bump_version_patch.outputs.next-version }}" + + # Check if steps are defined before calling create_release so we don't do unnecessary steps + if [ -n "${{ steps.bump_version_major.outputs.next-version }}" ]; then + create_release "${{ steps.bump_version_major.outputs.next-version }}" + fi + + if [ -n "${{ steps.bump_version_minor.outputs.next-version }}" ]; then + create_release "${{ steps.bump_version_minor.outputs.next-version }}" + fi + + if [ -n "${{ steps.bump_version_patch.outputs.next-version }}" ]; then + create_release "${{ steps.bump_version_patch.outputs.next-version }}" + fi From 8e12d75404162886f55a07ce2414af9652decf79 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 00:30:45 -0500 Subject: [PATCH 05/21] ci: add release.yml to help automate release versions. Lowercased V so it looks like v1.1.0 instead of V1.1.0 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1681e04..afb4613 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -87,7 +87,7 @@ jobs: create_release() { local version="${1}" if [ -n "${version}" ]; then - version="V${version}" + version="v${version}" fi curl \ -X POST \ From 857f52ba289e5cd81f98cadcfdde3b4cb6a99671 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 02:13:45 -0500 Subject: [PATCH 06/21] ci: changing structure of release.yml to be easier to understand --- .github/workflows/release.yml | 118 ++++++++-------------------------- 1 file changed, 27 insertions(+), 91 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index afb4613..c5bf720 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,99 +16,35 @@ jobs: if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - - name: Taking the Latest Release Tag number - id: releaseVersion - run: | - repo="${{ github.repository }}" - latest_release=$(curl -s "https://api.github.com/repos/$repo/releases" | jq -r '.[0].name' ) - latest_tag=$(curl -s "https://api.github.com/repos/$repo/tags" | jq -r '.[0].tag_name') - - - if [ -z "$latest_release" ] && [ -z "$latest_tag" ]; then - echo "No releases or tags found. Setting default version to 0.1.0" - Release_tag="v0.1.0" - elif [ -z "$latest_release" ]; then - echo "No releases found. Using latest tag version." - Release_tag=$latest_tag - elif [ -z "$latest_tag" ]; then - echo "No tags found. Using latest release version." - Release_tag=$latest_release - elif [[ "$latest_release" > "$latest_tag" ]]; then - echo "Latest release is newer. Using release version." - Release_tag=$latest_release - else - echo "Latest tag is newer. Using tag version." - Release_tag=$latest_tag - fi - - echo "::set-output name=Release_tag::$Release_tag" - - name: Checkout code uses: actions/checkout@v2 - - name: Bumping Major Index - id: bump_version_major - if: contains(github.event.pull_request.title, 'major') - uses: christian-draeger/increment-semantic-version@1.1.0 - with: - current-version: ${{ steps.releaseVersion.outputs.Release_tag }} - version-fragment: 'major' - - - name: Bumping Minor Index - id: bump_version_minor - if: contains(github.event.pull_request.title, 'feat') - - uses: christian-draeger/increment-semantic-version@1.1.0 - with: - current-version: ${{ steps.releaseVersion.outputs.Release_tag }} - version-fragment: 'feature' - - - name: Bumping Patch Index - id: bump_version_patch - if: | - ${{ contains(github.event.pull_request.title, 'patch') || - contains(github.event.pull_request.title, 'build') || - contains(github.event.pull_request.title, 'chore') || - contains(github.event.pull_request.title, 'ci') || - contains(github.event.pull_request.title, 'docs') || - contains(github.event.pull_request.title, 'style') || - contains(github.event.pull_request.title, 'refactor') || - contains(github.event.pull_request.title, 'perf') || - contains(github.event.pull_request.title, 'test') }} - uses: christian-draeger/increment-semantic-version@1.1.0 - with: - current-version: ${{ steps.releaseVersion.outputs.Release_tag }} - version-fragment: 'bug' - - - name: Create release version for bump_version_major - env: + - name: 'Automated Version Bump' + id: version-bump + uses: 'phips28/gh-action-bump-version@master' + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - create_release() { - local version="${1}" - if [ -n "${version}" ]; then - version="v${version}" - fi - curl \ - -X POST \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ - https://api.github.com/repos/${repo}/releases \ - -d '{"tag_name":"'"${version}"'","target_commitish":"'"${branch}"'","name":"'"${version}"'","body":"","draft":false,"prerelease":false,"generate_release_notes":true}' - } + with: + major-wording: 'MAJOR,major-change' + minor-wording: 'feat,' + patch-wording: 'patch,fix,build,chore,ci,docs,style,refactor,perf,test' # Providing patch-wording will override commits + tag-prefix: 'v' + default: patch + - name: Changelog + uses: scottbrenner/generate-changelog-action@master + id: Changelog + env: + REPO: ${{ github.repository }} + - name: Create Release + id: create_release + uses: actions/create-release@latest + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.version-bump.outputs.newTag }} + release_name: ${{ steps.version-bump.outputs.newTag }} + body: | + ${{ steps.Changelog.outputs.changelog }} + draft: false + prerelease: false - repo=${{ github.repository }} - branch=${{ github.head_ref }} - - # Check if steps are defined before calling create_release so we don't do unnecessary steps - if [ -n "${{ steps.bump_version_major.outputs.next-version }}" ]; then - create_release "${{ steps.bump_version_major.outputs.next-version }}" - fi - - if [ -n "${{ steps.bump_version_minor.outputs.next-version }}" ]; then - create_release "${{ steps.bump_version_minor.outputs.next-version }}" - fi - - if [ -n "${{ steps.bump_version_patch.outputs.next-version }}" ]; then - create_release "${{ steps.bump_version_patch.outputs.next-version }}" - fi From 0dac20412db226525c632a35f7bcd3131f120f1e Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 02:27:59 -0500 Subject: [PATCH 07/21] ci: #minor changes made --- .github/workflows/release.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c5bf720..ea2f9a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,15 +21,11 @@ jobs: - name: 'Automated Version Bump' id: version-bump - uses: 'phips28/gh-action-bump-version@master' + uses: anothrNick/github-tag-action@1.36.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - major-wording: 'MAJOR,major-change' - minor-wording: 'feat,' - patch-wording: 'patch,fix,build,chore,ci,docs,style,refactor,perf,test' # Providing patch-wording will override commits - tag-prefix: 'v' - default: patch + WITH_V: true + DEFAULT_BUMP: patch - name: Changelog uses: scottbrenner/generate-changelog-action@master id: Changelog @@ -41,8 +37,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ steps.version-bump.outputs.newTag }} - release_name: ${{ steps.version-bump.outputs.newTag }} + tag_name: ${{ steps.version-bump.outputs.new_tag }} + release_name: ${{ steps.version-bump.outputs.new_tag }} body: | ${{ steps.Changelog.outputs.changelog }} draft: false From 7c0100e4e3ebdb0abd43df1b6df2cf9e6fe24eda Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 02:37:19 -0500 Subject: [PATCH 08/21] ci: #minor changes made to make rolling and stable both release branches --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ea2f9a1..49c65ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,11 +36,14 @@ jobs: uses: actions/create-release@latest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PRERELEASE_SUFFIX: + RELEASE_BRANCHES: rolling,stable with: tag_name: ${{ steps.version-bump.outputs.new_tag }} release_name: ${{ steps.version-bump.outputs.new_tag }} body: | ${{ steps.Changelog.outputs.changelog }} + draft: false prerelease: false From 1ec4d0007ff304996de54d0d404b62ceb8165626 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 02:40:14 -0500 Subject: [PATCH 09/21] ci: #minor changes to hopefully turn off pre-release --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49c65ea..a6a73a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: uses: actions/create-release@latest env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PRERELEASE_SUFFIX: + PRERELEASE: false RELEASE_BRANCHES: rolling,stable with: tag_name: ${{ steps.version-bump.outputs.new_tag }} From 39a23e399075dcab253bda18610fda2616c70edb Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 02:43:51 -0500 Subject: [PATCH 10/21] ci: #minor change - trying to make pre-release suffic set to nothing --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a6a73a6..5327c72 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,6 +38,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PRERELEASE: false RELEASE_BRANCHES: rolling,stable + PRERELEASE_SUFFIX: '' with: tag_name: ${{ steps.version-bump.outputs.new_tag }} release_name: ${{ steps.version-bump.outputs.new_tag }} From 1252d51d2871ce515eb8707157f1534cc0878096 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:18:02 -0500 Subject: [PATCH 11/21] ci: #minor change - removed older release action for a better up to date one --- .github/workflows/release.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5327c72..e8f864b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,25 +26,22 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} WITH_V: true DEFAULT_BUMP: patch + PRERELEASE: false + DEFAULT_BRANCH: rolling - name: Changelog uses: scottbrenner/generate-changelog-action@master id: Changelog env: REPO: ${{ github.repository }} - name: Create Release - id: create_release - uses: actions/create-release@latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PRERELEASE: false - RELEASE_BRANCHES: rolling,stable - PRERELEASE_SUFFIX: '' + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') with: + token: ${{ secrets.GITHUB_TOKEN }} + generate_release_notes: true + name: ${{ steps.version-bump.outputs.new_tag }} tag_name: ${{ steps.version-bump.outputs.new_tag }} - release_name: ${{ steps.version-bump.outputs.new_tag }} - body: | - ${{ steps.Changelog.outputs.changelog }} - - draft: false prerelease: false + env: + GITHUB_REPOSITORY: my_gh_org/my_gh_repo From bb18308505ab658c19613ff2cf253bb829f7e70f Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:30:32 -0500 Subject: [PATCH 12/21] ci: #minor change --- .github/workflows/release.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e8f864b..a8d56dd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,13 +12,15 @@ concurrency: production jobs: build: - name: Create Release + name: bump tag version and release if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 - + uses: actions/checkout@v3 + with: + ref: ${{ github.sha }} ## this seems to be required due to https://github.com/anothrNick/github-tag-action/issues/266 + fetch-depth: 0 - name: 'Automated Version Bump' id: version-bump uses: anothrNick/github-tag-action@1.36.0 @@ -35,7 +37,6 @@ jobs: REPO: ${{ github.repository }} - name: Create Release uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') with: token: ${{ secrets.GITHUB_TOKEN }} generate_release_notes: true @@ -43,5 +44,5 @@ jobs: tag_name: ${{ steps.version-bump.outputs.new_tag }} prerelease: false env: - GITHUB_REPOSITORY: my_gh_org/my_gh_repo + GITHUB_REPOSITORY: ${{ github.repository }} From 08bd47b088f8e4cef72db429d60155feed3d20fa Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:36:11 -0500 Subject: [PATCH 13/21] ci: #minor change to fixed the pre-release issue --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8d56dd..9b10523 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: WITH_V: true DEFAULT_BUMP: patch PRERELEASE: false - DEFAULT_BRANCH: rolling + RELEASE_BRANCHES: rolling - name: Changelog uses: scottbrenner/generate-changelog-action@master id: Changelog From c5ee4aafcfa740b56feff7cecb8fa1c35ae57764 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:44:56 -0500 Subject: [PATCH 14/21] ci: #minor change to fixed the pre-release issue again --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b10523..fd44a02 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,8 @@ jobs: DEFAULT_BUMP: patch PRERELEASE: false RELEASE_BRANCHES: rolling + DEFAULT_BRANCH: rolling + pre_release: false - name: Changelog uses: scottbrenner/generate-changelog-action@master id: Changelog From 7c36c3e1e5ae2c4ba659f9988a5e19d1f0e0f2ef Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:46:57 -0500 Subject: [PATCH 15/21] ci: #minor change to fixed the pre-release issue again2 --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fd44a02..f015248 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,6 +32,7 @@ jobs: RELEASE_BRANCHES: rolling DEFAULT_BRANCH: rolling pre_release: false + PRERELEASE_SUFFIX: '' - name: Changelog uses: scottbrenner/generate-changelog-action@master id: Changelog From 0825e7801af6cad7c5e9bba3b55774b21b79e90a Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:54:38 -0500 Subject: [PATCH 16/21] ci: changed action for tag. I believe it was causing errors --- .github/workflows/release.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f015248..6d177ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,18 +21,10 @@ jobs: with: ref: ${{ github.sha }} ## this seems to be required due to https://github.com/anothrNick/github-tag-action/issues/266 fetch-depth: 0 - - name: 'Automated Version Bump' - id: version-bump - uses: anothrNick/github-tag-action@1.36.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - WITH_V: true - DEFAULT_BUMP: patch - PRERELEASE: false - RELEASE_BRANCHES: rolling - DEFAULT_BRANCH: rolling - pre_release: false - PRERELEASE_SUFFIX: '' + - name: Bump version and push tag + uses: hennejg/github-tag-action@v4.1.jh1 + with: + github_token: ${{ secrets.GITHUB_TOKEN } - name: Changelog uses: scottbrenner/generate-changelog-action@master id: Changelog From 2f41a4fd48b0df2aaa1d86304a416b48f67144cc Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:55:49 -0500 Subject: [PATCH 17/21] ci: missing } --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d177ba..a0f184e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: - name: Bump version and push tag uses: hennejg/github-tag-action@v4.1.jh1 with: - github_token: ${{ secrets.GITHUB_TOKEN } + github_token: ${{ secrets.GITHUB_TOKEN }} - name: Changelog uses: scottbrenner/generate-changelog-action@master id: Changelog From 74abaa767f488bc1e541d4f2d402ee7e3c9cc910 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:59:23 -0500 Subject: [PATCH 18/21] ci: testing some things --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0f184e..cc0ddb8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: ref: ${{ github.sha }} ## this seems to be required due to https://github.com/anothrNick/github-tag-action/issues/266 fetch-depth: 0 - name: Bump version and push tag - uses: hennejg/github-tag-action@v4.1.jh1 + uses: hennejg/github-tag-action@v4.3.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Changelog From 750204d910b91ddccac47da101035cf92d66c7bf Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 10:03:20 -0500 Subject: [PATCH 19/21] ci: fixing self inflicted error where I forgot to put an ID in --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc0ddb8..8819d87 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,7 @@ jobs: ref: ${{ github.sha }} ## this seems to be required due to https://github.com/anothrNick/github-tag-action/issues/266 fetch-depth: 0 - name: Bump version and push tag + id: version-bump uses: hennejg/github-tag-action@v4.3.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} From 4a7ead58a820cefd4a231ac7ade4b48355116c04 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 10:07:02 -0500 Subject: [PATCH 20/21] ci: fixing to make the release branch rolling --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8819d87..0b1c2cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,6 +26,7 @@ jobs: uses: hennejg/github-tag-action@v4.3.1 with: github_token: ${{ secrets.GITHUB_TOKEN }} + release_branches: rolling - name: Changelog uses: scottbrenner/generate-changelog-action@master id: Changelog From a597525470ed140bdd0474cd54b07f54d09a2604 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 10:46:42 -0500 Subject: [PATCH 21/21] ci: reset commit and removed changelog --- .github/workflows/release.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b1c2cd..83f64ec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 with: - ref: ${{ github.sha }} ## this seems to be required due to https://github.com/anothrNick/github-tag-action/issues/266 + ref: ${{ github.sha }} fetch-depth: 0 - name: Bump version and push tag id: version-bump @@ -27,11 +27,6 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} release_branches: rolling - - name: Changelog - uses: scottbrenner/generate-changelog-action@master - id: Changelog - env: - REPO: ${{ github.repository }} - name: Create Release uses: softprops/action-gh-release@v1 with: