From a60aa76f98a964bfef0a7c3736909c931611e146 Mon Sep 17 00:00:00 2001 From: Scott Date: Sat, 27 Jan 2024 22:58:03 -0500 Subject: [PATCH 01/51] 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/51] 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/51] 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/51] 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/51] 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/51] 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/51] 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/51] 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/51] 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/51] 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/51] 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/51] 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/51] 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/51] 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/51] 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 392901f6f9ac8112e50ffb79e32068c3af6bbff2 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:54:38 -0500 Subject: [PATCH 16/51] 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 2b3bfd96c2d3a2a56902b9dbe3619ba4cfd05948 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:55:49 -0500 Subject: [PATCH 17/51] 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 96e786b5cb92669fd86e954d689bd914ee378134 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:59:23 -0500 Subject: [PATCH 18/51] 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 07ab7968d020a83a7c056527c8c13806bca5d805 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 10:03:20 -0500 Subject: [PATCH 19/51] 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 89f3ae8b56291bf46ae4651cbc063bf796b4a80b Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 10:07:02 -0500 Subject: [PATCH 20/51] 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 29dece3d9b84b96db40f01a5e24c89dbddc1f20f Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 10:11:07 -0500 Subject: [PATCH 21/51] major: testing updating major --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b1c2cd..ed1efe0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,3 +43,4 @@ jobs: env: GITHUB_REPOSITORY: ${{ github.repository }} + From 4ed6a1cdd398667fd34b8ac8c10957211b85df22 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 10:13:57 -0500 Subject: [PATCH 22/51] BREAKING CHANGE: removed changelog action --- .github/workflows/release.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ed1efe0..19d871a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: @@ -41,6 +36,4 @@ jobs: tag_name: ${{ steps.version-bump.outputs.new_tag }} prerelease: false env: - GITHUB_REPOSITORY: ${{ github.repository }} - - + GITHUB_REPOSITORY: ${{ github.repository }} \ No newline at end of file From c7584ade0d25f13f92e3b6e6d5dc4bb90f033721 Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 10:36:34 -0500 Subject: [PATCH 23/51] 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 ed1efe0..ad1f703 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 0825e7801af6cad7c5e9bba3b55774b21b79e90a Mon Sep 17 00:00:00 2001 From: Scott Date: Sun, 28 Jan 2024 09:54:38 -0500 Subject: [PATCH 24/51] 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 25/51] 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 26/51] 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 27/51] 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 28/51] 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 29/51] 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 30/51] 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: From 7e02b6f0ef4a0e7614c362a7510a0d0ea50af2e5 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 07:11:59 -0500 Subject: [PATCH 31/51] ci: using echo and double quotes in the appversion variable. Testing now --- .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 5cf1b83..9fb2a18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: echo "current-version=$LF_VERSION" >> "$GITHUB_OUTPUT" - name: update cargo.toml run: | - appversion=$(${{ steps.version-bump.outputs.new_tag }} | sed 's/[v]//') + appversion=$(echo "${{ 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 From 9df36aeeadd9116d40b4a06f0fd69a6025d89cc5 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 07:58:57 -0500 Subject: [PATCH 32/51] ci: testing autocommit --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de971df..1ae81c0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,7 @@ jobs: run: | appversion=$(echo "${{ steps.version-bump.outputs.new_tag }}" | sed 's/[v]//') sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml + - uses: stefanzweifel/git-auto-commit-action@v5 - name: Create Release uses: softprops/action-gh-release@v1 with: From 8f8e1b7597ee039382dd59153d4ecccfcb8a3122 Mon Sep 17 00:00:00 2001 From: scottc943 Date: Mon, 29 Jan 2024 13:00:02 +0000 Subject: [PATCH 33/51] Apply automatic changes --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index fdfbe32..d705fe3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "1.9.4" +version = "2.0.4" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From e0b0d34750c471f3e1209161b5bbfbd481ab8a8e Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 08:03:49 -0500 Subject: [PATCH 34/51] ci: testing autocommit further --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ae81c0..b26f8f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,6 +37,9 @@ jobs: appversion=$(echo "${{ steps.version-bump.outputs.new_tag }}" | sed 's/[v]//') sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml - uses: stefanzweifel/git-auto-commit-action@v5 + with: + branch: rolling + tagging_message: ${{ steps.version-bump.outputs.new_tag }} - name: Create Release uses: softprops/action-gh-release@v1 with: From 559c7fcb7653b83ee4ec9be289635cf8183bdfd9 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 08:06:26 -0500 Subject: [PATCH 35/51] ci: testing autocommit: removing tagging since it creates another tag instead of using that tag --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b26f8f1..bc77076 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,6 @@ jobs: - uses: stefanzweifel/git-auto-commit-action@v5 with: branch: rolling - tagging_message: ${{ steps.version-bump.outputs.new_tag }} - name: Create Release uses: softprops/action-gh-release@v1 with: From e0b683b4caadf329c1092946be2fb0f59e2d1ab9 Mon Sep 17 00:00:00 2001 From: scottc943 Date: Mon, 29 Jan 2024 13:07:27 +0000 Subject: [PATCH 36/51] Apply automatic changes --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d705fe3..cc05c60 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "2.0.4" +version = "2.0.6" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From 2e653d1905ec273209f4cbeb5ea14dd0fdd99eb9 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 10:36:19 -0500 Subject: [PATCH 37/51] ci: testing autocommit with branch protection and doing a PR to rolling --- .github/workflows/release.yml | 22 +++++++++++++++------- Cargo.toml | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bc77076..5b6421d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,18 +27,26 @@ 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=$(echo "${{ steps.version-bump.outputs.new_tag }}" | sed 's/[v]//') sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml - uses: stefanzweifel/git-auto-commit-action@v5 - with: - branch: rolling + # create PR using GitHub CLI + - name: create PR with release info + if: steps.changelog.outputs.skipped == 'false' + id: create-pr + run: gh pr create --base main --head release-from-${{ github.sha }} --title 'Merge new release into main' --body 'Created by Github action' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # merge PR using GitHub CLI + - name: merge PR with release info + if: steps.changelog.outputs.skipped == 'false' + id: merge-pr + run: gh pr merge --admin --merge --subject 'Merge release info' --delete-branch + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Create Release uses: softprops/action-gh-release@v1 with: diff --git a/Cargo.toml b/Cargo.toml index d705fe3..e06bc30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "2.0.4" +version = "1.9.6" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From 976af538e11f0dcce1d91c0c7b1af699ec4af303 Mon Sep 17 00:00:00 2001 From: scottc943 Date: Mon, 29 Jan 2024 15:39:21 +0000 Subject: [PATCH 38/51] Apply automatic changes --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e06bc30..03a6aec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "1.9.6" +version = "2.0.7" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From 5c98982612f7f41d428e50e2e275883a345246ad Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 10:46:36 -0500 Subject: [PATCH 39/51] ci: testing PR create and merge - removed the if that was causing it not to run --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5b6421d..62471f0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,14 +34,12 @@ jobs: - uses: stefanzweifel/git-auto-commit-action@v5 # create PR using GitHub CLI - name: create PR with release info - if: steps.changelog.outputs.skipped == 'false' id: create-pr run: gh pr create --base main --head release-from-${{ github.sha }} --title 'Merge new release into main' --body 'Created by Github action' env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # merge PR using GitHub CLI - name: merge PR with release info - if: steps.changelog.outputs.skipped == 'false' id: merge-pr run: gh pr merge --admin --merge --subject 'Merge release info' --delete-branch env: From 6e60be365b3be0d3d56cabbb9edb395a5c89e25d Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 10:47:30 -0500 Subject: [PATCH 40/51] ci: testing PR create and merge - removed the if that was causing it not to run --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 03a6aec..e06bc30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "2.0.7" +version = "1.9.6" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From c95bb7d00044b3cf78bc102d5bf9b4aefb2b8745 Mon Sep 17 00:00:00 2001 From: scottc943 Date: Mon, 29 Jan 2024 15:48:16 +0000 Subject: [PATCH 41/51] Apply automatic changes --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e06bc30..0a31aaf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "1.9.6" +version = "2.0.8" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From d9841bfdcdebff1ae529c860c3884af184932c03 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 10:51:21 -0500 Subject: [PATCH 42/51] ci: testing PR create and merge - fixed permission issues --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62471f0..98058c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,8 @@ on: permissions: contents: write + pull-requests: write + repository-projects: write concurrency: production From 542f27f5ca8f30234c9acd9709d6fd5b2077ee95 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 10:52:16 -0500 Subject: [PATCH 43/51] ci: testing PR create and merge - fixed permission issues --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 0a31aaf..e06bc30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "2.0.8" +version = "1.9.6" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From 39d9dccb7a24bd5985ae3deb78f1684a383f336b Mon Sep 17 00:00:00 2001 From: scottc943 Date: Mon, 29 Jan 2024 15:52:57 +0000 Subject: [PATCH 44/51] Apply automatic changes --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e06bc30..a40a0a3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "1.9.6" +version = "2.0.9" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From c62a0c07b48c507d887e0b3cf84123520dec055d Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 11:05:40 -0500 Subject: [PATCH 45/51] ci: testing PR create and merge - potentially fixed PR issue --- .github/workflows/release.yml | 14 ++++++++++---- Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98058c5..fc70e58 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,21 +29,27 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} release_branches: rolling + - name: create branch + uses: peterjgrainger/action-create-branch@v2.2.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + branch: update-from-${{ github.sha }} - name: update cargo.toml run: | appversion=$(echo "${{ steps.version-bump.outputs.new_tag }}" | sed 's/[v]//') sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml - uses: stefanzweifel/git-auto-commit-action@v5 # create PR using GitHub CLI - - name: create PR with release info + - name: create PR with update info id: create-pr - run: gh pr create --base main --head release-from-${{ github.sha }} --title 'Merge new release into main' --body 'Created by Github action' + run: gh pr create --base rolling --head update-from-${{ github.sha }} --title 'Merge new update into rolling' --body 'Created by Github action' env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} # merge PR using GitHub CLI - - name: merge PR with release info + - name: merge PR with update info id: merge-pr - run: gh pr merge --admin --merge --subject 'Merge release info' --delete-branch + run: gh pr merge --admin --merge --subject 'Merge update info' --delete-branch env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.toml b/Cargo.toml index a40a0a3..e06bc30 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "2.0.9" +version = "1.9.6" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From a7b8be2bdfa5c79a46dfc7bdcf6ee0a9ce12f09b Mon Sep 17 00:00:00 2001 From: scottc943 Date: Mon, 29 Jan 2024 16:06:38 +0000 Subject: [PATCH 46/51] Apply automatic changes --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index e06bc30..79e6e1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "1.9.6" +version = "2.0.10" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From 7748ed2b08ddac4d59b642c506f26594e569a26a Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 11:30:26 -0500 Subject: [PATCH 47/51] ci: testing PR create and merge - potentially fixed PR issue2 --- .github/workflows/release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fc70e58..a0aa241 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,10 @@ jobs: run: | appversion=$(echo "${{ steps.version-bump.outputs.new_tag }}" | sed 's/[v]//') sed -i -e "s/^version = .*/version = \"$appversion\"/" Cargo.toml - - uses: stefanzweifel/git-auto-commit-action@v5 + - name: auto commit + uses: stefanzweifel/git-auto-commit-action@v5 + with: + branch: feature-123 # create PR using GitHub CLI - name: create PR with update info id: create-pr From a5284e8b62c45700a2ea427d986a32565241a7e3 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 12:30:11 -0500 Subject: [PATCH 48/51] ci: testing PR create and merge - potentially fixed PR issue + fixing what branch it targets --- .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 a0aa241..a2fd929 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: - name: auto commit uses: stefanzweifel/git-auto-commit-action@v5 with: - branch: feature-123 + branch: update-from-${{ github.sha }} # create PR using GitHub CLI - name: create PR with update info id: create-pr From 4c056a327c26ed15181897e7e6c5f7ecb694bbd7 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 13:00:30 -0500 Subject: [PATCH 49/51] ci: testing PR create and merge - testing PAT --- .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 a2fd929..bb8b80a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,7 +54,7 @@ jobs: id: merge-pr run: gh pr merge --admin --merge --subject 'Merge update info' --delete-branch env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.ADMIN_RIGHTS_TOKEN }} - name: Create Release uses: softprops/action-gh-release@v1 From 31837eb7ec393b49069d8d755f31efc464c13339 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 14:14:11 -0500 Subject: [PATCH 50/51] ci: testing PR create and merge - testing to see if merge loop stops --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bb8b80a..e0d2977 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ concurrency: production jobs: build: name: bump tag version and release - if: github.event.pull_request.merged == true + if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - name: Checkout code @@ -42,6 +42,7 @@ jobs: - name: auto commit uses: stefanzweifel/git-auto-commit-action@v5 with: + commit_message: "[skip ci] Automated Change" branch: update-from-${{ github.sha }} # create PR using GitHub CLI - name: create PR with update info From 33a861ffd4a9dc10857396115cc9aee63b18af74 Mon Sep 17 00:00:00 2001 From: Scott Date: Mon, 29 Jan 2024 14:28:13 -0500 Subject: [PATCH 51/51] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 79e6e1d..fdfbe32 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "2.0.10" +version = "1.9.4" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx"