From 0825e7801af6cad7c5e9bba3b55774b21b79e90a Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:54:38 -0500 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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: From fab6c40763fba772731bce58e6bb4251af5024de Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 07:06:15 -0500 Subject: [PATCH 7/7] ci: added step to change Cargo.toml app version to the latest tag version without the v --- .github/workflows/release.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 83f64ec..5cf1b83 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,15 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} release_branches: rolling + - name: get-app-version + id: package-version + run: | + LF_VERSION=$(cat package.json | jq -r '.version') + echo "current-version=$LF_VERSION" >> "$GITHUB_OUTPUT" + - name: update cargo.toml + run: | + appversion=$(${{ steps.version-bump.outputs.new_tag }} | sed 's/[v]//') + sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml - name: Create Release uses: softprops/action-gh-release@v1 with: