diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a1ee4de399..307490be39 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -8,7 +8,7 @@ concurrency: cancel-in-progress: true on: pull_request: - branches: [ master, v2 ] + branches: [ master, v1 ] workflow_dispatch: jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4a8c53bd9d..0bb38ea657 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,6 +9,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + if: ${{ startsWith(github.event.release.tag_name, 'v1.' ) }} + with: + ref: "v1" + - uses: actions/checkout@v2 + if: ${{ startsWith(github.event.release.tag_name, 'v2.') }} - name: Set up Java and Maven uses: actions/setup-java@v2 with: @@ -20,20 +25,25 @@ jobs: run: ./mvnw ${MAVEN_ARGS} versions:set -DnewVersion="${RELEASE_VERSION:1}" versions:commit env: RELEASE_VERSION: ${{ github.event.release.tag_name }} - - name: Release Maven package - uses: samuelmeuli/action-maven-publish@v1 - with: - maven_profiles: "release" - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }} - nexus_username: ${{ secrets.OSSRH_USERNAME }} - nexus_password: ${{ secrets.OSSRH_TOKEN }} + # - name: Release Maven package + # uses: samuelmeuli/action-maven-publish@v1 + # with: + # maven_profiles: "release" + # gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} + # gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }} + # nexus_username: ${{ secrets.OSSRH_USERNAME }} + # nexus_password: ${{ secrets.OSSRH_TOKEN }} # This is separate job because there were issues with git after release step, was not able to commit changes. See history. update-working-version: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + if: ${{ startsWith(github.event.release.tag_name, 'v1.' ) }} + with: + ref: "v1" + - uses: actions/checkout@v2 + if: ${{ startsWith(github.event.release.tag_name, 'v2.') }} - name: Set up Java and Maven uses: actions/setup-java@v2 with: @@ -49,7 +59,14 @@ jobs: git commit -m "Set new SNAPSHOT version into pom files." -a env: RELEASE_VERSION: ${{ github.event.release.tag_name }} - - name: Push changes + - name: Push changes v1 + uses: ad-m/github-push-action@master + if: ${{ startsWith(github.event.release.tag_name, 'v1.' ) }} + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: "v1" + - name: Push changes v2 uses: ad-m/github-push-action@master + if: ${{ startsWith(github.event.release.tag_name, 'v2.' ) }} with: github_token: ${{ secrets.GITHUB_TOKEN }}