diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 341788f5e..cc6cfe8fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ concurrency: jobs: build: name: "Build" - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 env: ALLURE_MATRIX_ENV: ubuntu-jdk-21 ALLURE_TEST_DUMP_NAME: allure-results-test-jdk-21 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index bc4eb73dc..df2371b29 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,7 +9,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v7 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1af69ff51..612e59be7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,6 +38,7 @@ jobs: - uses: actions/checkout@v7 with: + ref: ${{ github.ref }} token: ${{ steps.app-token.outputs.token }} - name: "Configure CI Git User" @@ -52,21 +53,23 @@ jobs: run: | git commit -am "release ${{ github.event.inputs.releaseVersion }}" git tag ${{ github.event.inputs.releaseVersion }} - git push origin ${{ github.event.inputs.releaseVersion }} - name: "Set next development version" run: | sed -i -e '/version=/s/.*/version=${{ github.event.inputs.nextVersion }}-SNAPSHOT/g' gradle.properties cat gradle.properties - - name: "Commit next development version and push it" + - name: "Commit next development version and push release" run: | git commit -am "set next development version ${{ github.event.inputs.nextVersion }}" - git push origin ${{ github.ref }} + git push --atomic origin \ + HEAD:${{ github.ref }} \ + refs/tags/${{ github.event.inputs.releaseVersion }} - name: "Publish Github Release" uses: octokit/request-action@v2.x with: route: POST /repos/${{ github.repository }}/releases tag_name: ${{ github.event.inputs.releaseVersion }} generate_release_notes: true + make_latest: false target_commitish: ${{ github.ref }} env: GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}