diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 332703e..e896704 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -30,10 +30,9 @@ 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 - namespace: "rc" - name: Bump version and push tag id: tag_version @@ -58,6 +57,4 @@ jobs: tag: ${{ steps.tag_version.outputs.new_tag }} name: ${{ steps.versioning.outputs.version_tag }} body: ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: true commit: ${{ steps.versioning.outputs.current_commit }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5394a79..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 @@ -57,6 +57,4 @@ jobs: tag: ${{ steps.tag_version.outputs.new_tag }} name: ${{ steps.versioning.outputs.version_tag }} body: ${{ steps.changelog.outputs.changelog }} - draft: false - prerelease: false commit: ${{ steps.versioning.outputs.current_commit }} 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