From a4c416a30368b20b6429214be1aba06996c088a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Wed, 11 Dec 2024 01:41:22 +0100 Subject: [PATCH] Dont change 999-SNAPSHOT in main branch during release --- .github/workflows/daily-deploy.yml | 1 - .github/workflows/release.yml | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/daily-deploy.yml b/.github/workflows/daily-deploy.yml index 4788db187..4e232f1d4 100644 --- a/.github/workflows/daily-deploy.yml +++ b/.github/workflows/daily-deploy.yml @@ -26,7 +26,6 @@ jobs: - name: Maven release 999-SNAPSHOT run: | - mvn -B versions:set -DnewVersion=999-SNAPSHOT mvn -B -DskipTests -DskipITs \ -DretryFailedDeploymentCount=3 \ -Psnapshot,framework \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1bf2d6a76..adbb20c63 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: - name: Maven release ${{steps.metadata.outputs.current-version}} run: | git checkout -b release - mvn -B release:prepare -Prelease,framework,examples -DautoVersionSubmodules -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}-SNAPSHOT + mvn -B release:prepare -Prelease,framework -DpushChanges=false -DautoVersionSubmodules -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=999-SNAPSHOT git checkout ${{github.base_ref}} git rebase release mvn -B release:perform -DskipITs -Prelease,framework @@ -51,12 +51,6 @@ jobs: MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - - name: Push changes to ${{github.base_ref}} - uses: ad-m/github-push-action@v0.8.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{github.base_ref}} - - name: Push tags uses: ad-m/github-push-action@v0.8.0 with: