From 5ffe2356f748d908beb0f36347a8a6cd26d40f96 Mon Sep 17 00:00:00 2001 From: Aleksandar Stanchev Date: Tue, 1 Oct 2024 11:50:09 +0300 Subject: [PATCH] #2029 fix Ditto version There is no need to differentiate built artefacts do no mather the branch source always 0-SNAPSHOT will be used --- .github/workflows/system-tests.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index b61e4e8713..f2c3e4e948 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -58,6 +58,7 @@ jobs: DITTO_REPO: ${{ github.event.inputs.ditto_repo }} DITTO_TESTING_BRANCH: ${{ github.event.inputs.ditto_testing_branch }} DITTO_TESTING_REPO: ${{ github.event.inputs.ditto_testing_repo }} + DITTO_VERSION: '0-SNAPSHOT' COMPOSE_PROJECT_NAME: '${{ github.job }}-${{ github.run_number }}' DOCKER_NETWORK: 'test' TEST_JAVA_OPTIONS: '-XX:+UseContainerSupport -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -Dpekko.cluster.failure-detector.acceptable-heartbeat-pause=20s' @@ -133,20 +134,6 @@ jobs: echo "HOST_M2_REPO=$M2_REPO" >> $GITHUB_ENV fi - - name: Set DITTO_VERSION - id: set_version - run: | - if [[ "$DITTO_BRANCH" == "master" || "$DITTO_BRANCH" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - echo "DITTO_VERSION=nightly" >> $GITHUB_ENV - else - SANITIZED_BRANCH_NAME=${DITTO_BRANCH//[\/]/-} - DITTO_VERSION="0-${SANITIZED_BRANCH_NAME}-SNAPSHOT" - echo "DITTO_VERSION=$DITTO_VERSION" >> $GITHUB_ENV - echo "SERVICE_VERSION=$DITTO_VERSION" >> $GITHUB_ENV - fi - echo "DITTO_VERSION=$DITTO_VERSION" - echo "::set-output name=ditto_version::$DITTO_VERSION" - - name: Compile Ditto working-directory: ./ditto run: |