From 577015ed28a49aad4cdb7a8007d68e9c0aafeefd Mon Sep 17 00:00:00 2001 From: Sarbagya Dhaubanjar Date: Tue, 22 Apr 2025 23:16:04 +0545 Subject: [PATCH 1/2] Refactor versioning in workflows: remove 'rc' suffix and adjust job names --- .github/workflows/dev.yml | 1 - .github/workflows/main.yml | 4 ++-- .github/workflows/pr-version.yml | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 1106ec4..753c4cc 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -33,7 +33,6 @@ jobs: version_format: "${major}.${minor}.${patch}-rc${increment}" bump_each_commit: false search_commit_body: true - namespace: "rc" - name: Bump version and push tag id: tag_version diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 38c68f9..cefd8ec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ env: CI_COMMIT_AUTHOR: ci@acmesoftware.com jobs: - dev: + main: runs-on: ubuntu-latest permissions: @@ -30,7 +30,7 @@ jobs: tag_prefix: "v" major_pattern: "(MAJOR)" minor_pattern: "(MINOR)" - version_format: "${major}.${minor}.${patch}-rc${increment}" + version_format: "${major}.${minor}.${patch}" bump_each_commit: false search_commit_body: true diff --git a/.github/workflows/pr-version.yml b/.github/workflows/pr-version.yml index 0c27d84..acd7c4e 100644 --- a/.github/workflows/pr-version.yml +++ b/.github/workflows/pr-version.yml @@ -1,3 +1,5 @@ +name: PR Version + on: pull_request_target: types: @@ -20,7 +22,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - ref: "refs/pull/${{ github.event.number }}/merge" fetch-depth: 0 - name: Perform semantic version From 1e67bdda00c4e0c3da38b6075427f2b03815cfde Mon Sep 17 00:00:00 2001 From: Sarbagya Dhaubanjar Date: Tue, 22 Apr 2025 23:17:37 +0545 Subject: [PATCH 2/2] Remove increment suffix from version format in workflow --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 753c4cc..e896704 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -30,7 +30,7 @@ jobs: tag_prefix: "v" major_pattern: "(MAJOR)" minor_pattern: "(MINOR)" - version_format: "${major}.${minor}.${patch}-rc${increment}" + version_format: "${major}.${minor}.${patch}-rc" bump_each_commit: false search_commit_body: true