From 9341b765f2ca6064cc6efd5500680d0605970912 Mon Sep 17 00:00:00 2001 From: Guillaume Dugas Date: Wed, 18 Feb 2026 11:07:38 +0100 Subject: [PATCH] Update CI/CD --- .github/workflows/build.yml | 20 +++++++++++++++++--- pom.xml | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4911528..abd47ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,7 @@ jobs: env: MAVEN_ACCESS_TOKEN: ${{ secrets.CI_TOKEN }} MAVEN_REPO_OWNER: ${{ gitea.actor }} + RELEASE_VERSION_BASE: 1.0 steps: - name: Check out latest repository code uses: actions/checkout@v4 @@ -19,11 +20,24 @@ jobs: - name: Set versions run: | - export BUILD_VERSION=$(test "$GITHUB_REF_TYPE" = "tag" && echo ${GITHUB_REF_NAME} || (echo ${GITHUB_SHA} | head -c 8)) - ./mvnw versions:set -DnewVersion=${BUILD_VERSION} + VERSION_BASE=$RELEASE_VERSION_BASE + if [ "$GITHUB_REF_TYPE" = "tag" ]; then + VERSION_BASE="${GITHUB_REF_NAME}" + elif echo "$GITHUB_REF_NAME" | grep -qE '^release/'; then + VERSION_BASE="${GITHUB_REF_NAME#release/}" + fi + if [ "$GITHUB_REF_TYPE" = "branch" ]; then + BUILD_VERSION="${VERSION_BASE}-SNAPSHOT" + else + BUILD_VERSION="${VERSION_BASE}" + fi + ./mvnw versions:set -DnewVersion=${BUILD_VERSION} -DprocessAllModules=true - name: Build project - run: ./mvnw -s .mvn/settings.xml clean install + run: ./mvnw -s .mvn/settings.xml clean install -DskipTests + + - name: Run tests + run: ./mvnw -s .mvn/settings.xml test - name: Deploy project run: ./mvnw -s .mvn/settings.xml deploy diff --git a/pom.xml b/pom.xml index aa2dd4a..38876e5 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 2.9.0 1.18.38 1.6.3 - 3.31.3 + 3.29.4 ${project.version}