diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c0752a..7b3f71b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,6 +91,15 @@ jobs: event-type: utPLSQL-java-api-build client-payload: '{"api_version": "${{ steps.project_version.outputs.version }}"}' + - name: Trigger utPLSQL-maven-plugin snapshot build + if: github.event_name != 'pull_request' + uses: peter-evans/repository-dispatch@v3 + with: + token: ${{ secrets.CLI_REPO_TOKEN }} + repository: utPLSQL/utPLSQL-maven-plugin + event-type: utPLSQL-java-api-build + client-payload: '{"api_version": "${{ steps.project_version.outputs.version }}"}' + - name: Publish unit test results uses: EnricoMi/publish-unit-test-result-action@v2 if: always() diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a72eb9..19ea48f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,8 +7,13 @@ on: description: 'Release version (e.g. 3.2.3)' required: true next_snapshot: - description: 'Next snapshot version (e.g. 3.2.4) without the "-SNAPSHOT" word' - required: true + description: 'Next development version (default: auto-increment patch,e.g. 3.2.4) without the "-SNAPSHOT" word' + required: false + +permissions: + contents: write + id-token: write + attestations: write defaults: run: @@ -75,8 +80,7 @@ jobs: ${{ runner.os }}-maven- - name: Set release version - run: | - mvn versions:set -DnewVersion=${{ inputs.release_version }} -DgenerateBackupPoms=false + run: mvn versions:set -DnewVersion=${{ inputs.release_version }} -DgenerateBackupPoms=false - name: Build and test release run: mvn clean verify -Prelease @@ -93,18 +97,21 @@ jobs: - name: Commit and tag release version run: | - git add -u - git commit -m "chore(release): release ${{ inputs.release_version }} [skip ci]" + git add pom.xml + git commit -m "Release ${{ inputs.release_version }} [skip ci]" git tag -a "v${{ inputs.release_version }}" -m "Release ${{ inputs.release_version }}" - - name: Set next snapshot version - run: | - mvn versions:set -DnewVersion=${{ inputs.next_snapshot }}-SNAPSHOT -DgenerateBackupPoms=false - - - name: Commit next snapshot version + - name: Calculate and set next development version run: | - git add -u - git commit -m "chore(release): bump to ${{ inputs.next_snapshot }}-SNAPSHOT [skip ci]" + if [[ -n "${{ inputs.next_snapshot }}" ]]; then + NEXT="${{ inputs.next_snapshot }}-SNAPSHOT" + else + IFS='.' read -r major minor patch <<< "${{ inputs.release_version }}" + NEXT="${major}.${minor}.$((patch + 1))-SNAPSHOT" + fi + mvn -B versions:set -DnewVersion="$NEXT" -DgenerateBackupPoms=false + git add pom.xml + git commit -m "Prepare next development version $NEXT [skip ci]" - name: Push commits and tag run: | diff --git a/README.md b/README.md index d3d5797..3e83c92 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![latest-release](https://img.shields.io/github/release/utPLSQL/utPLSQL-java-api.svg)](https://github.com/utPLSQL/utPLSQL-java-api/releases) [![license](https://img.shields.io/github/license/utPLSQL/utPLSQL-java-api.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![Build status](https://github.com/utPLSQL/utPLSQL-java-api/actions/workflows/build.yml/badge.svg)](https://github.com/utPLSQL/utPLSQL-java-api/actions/workflows/build.yml) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL_utPLSQL-java-api&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=utPLSQL_utPLSQL-java-api) # utPLSQL-java-api This is a collection of classes, that makes it easy to access the [utPLSQL v3](https://github.com/utPLSQL/utPLSQL/) database objects using Java. diff --git a/pom.xml b/pom.xml index ed72c84..fcb57e4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.utplsql utplsql-java-api - 3.2.4 + 3.2.5-SNAPSHOT utPLSQL Java API Java API for running Unit Tests with utPLSQL v3+.