diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml index 15a6aca..a1bfa74 100644 --- a/.github/workflows/docker-build-dev.yml +++ b/.github/workflows/docker-build-dev.yml @@ -51,7 +51,8 @@ jobs: env | sort - name: Get current date id: date_selector - run: echo "DATE=$(date +'%B %e, %Y')" >> $GITHUB_OUTPUT + run: | + echo "DATE=$(date +'%B %e, %Y')" >> $GITHUB_OUTPUT outputs: DATE: ${{steps.date_selector.outputs.DATE}} Branch: diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml index 43463c1..a59f31c 100644 --- a/.github/workflows/docker-build-main.yml +++ b/.github/workflows/docker-build-main.yml @@ -49,7 +49,8 @@ jobs: env | sort - name: Get current date id: date_selector - run: echo "DATE=$(date +'%B %e, %Y')" >> $GITHUB_OUTPUT + run: | + echo "DATE=$(date +'%B %e, %Y')" >> $GITHUB_OUTPUT outputs: DATE: ${{steps.date_selector.outputs.DATE}} Branch: @@ -91,7 +92,7 @@ jobs: - name: Generate Next Git Tag id: tag_selector run: | - echo "Main branch current release: ${{env.UGM_BUILD_VERSION}}" + echo "Current release: ${{env.UGM_BUILD_VERSION}}" # Check the merged branch and set versions accordingly if [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == "test" ]]; then UGM_DEPLOY_VERSION=$(gh variable get UGM_BUILD_VERSION --env test) @@ -146,7 +147,9 @@ jobs: - name: Get repository version variables id: get_version run: | - gh variable list --env ${{env.TARGET_ENV}} + gh variable list --env dev + echo "..." + gh variable list --env test echo "..." echo "buildArgs --env ${{env.TARGET_ENV}} UNITY_BUILD_VERSION: ${{env.UGM_BUILD_VERSION}}, UNITY_BUILD_REVISION: ${{env.UGM_BUILD_REVISION}}, Merged Branch: ${{needs.Branch.outputs.MERGED_BRANCH}}" Build: diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index 1faa916..50e643b 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -65,7 +65,8 @@ jobs: fetch-depth: '1' - name: Get short commitId id: get_commit - run: echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + run: | + echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: List merged branch id: get_branch run: | @@ -93,6 +94,8 @@ jobs: - name: Generate Next Git Tag id: tag_selector run: | + echo "Current release: ${{env.UGM_BUILD_VERSION}}" + # Set version according to branching strategy, increment minor version, zero patch, pull to test/dev # Extract the major.minor.patch version parts using grep MAJOR_VERSION=$(echo "${{env.UGM_BUILD_VERSION}}" | grep -oE '^[0-9]+') MINOR_VERSION=$(echo "${{env.UGM_BUILD_VERSION}}" | grep -oE '\.[0-9]+\.' | grep -oE '[0-9]+') @@ -101,9 +104,9 @@ jobs: echo "${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" MINOR_VERSION=$((MINOR_VERSION + 1)) VERSION_PATCH=0 - echo "${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" - # Prepare tags - echo "TAGVERSION=$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" >> $GITHUB_OUTPUT + UGM_DEPLOY_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" + echo "Test branch tagged as latest release: $UGM_DEPLOY_VERSION" + echo "TAGVERSION=$UGM_DEPLOY_VERSION" >> $GITHUB_OUTPUT outputs: TAGVERSION: ${{steps.tag_selector.outputs.TAGVERSION}} PushVariables: diff --git a/applications/scripts/datafix-ab#001.sql b/applications/scripts/datafix-ab#001.sql index 09b099d..5f8d352 100644 --- a/applications/scripts/datafix-ab#001.sql +++ b/applications/scripts/datafix-ab#001.sql @@ -1 +1 @@ -test 14.3 +test 15 diff --git a/applications/scripts/datafix-ab#002.sql b/applications/scripts/datafix-ab#002.sql deleted file mode 100644 index e69de29..0000000