Skip to content

Commit

Permalink
Merge pull request #169 from bcgov/dev
Browse files Browse the repository at this point in the history
test 14.3
  • Loading branch information
DarylTodosichuk authored Oct 29, 2024
2 parents 0a27fb3 + 98adaef commit 97b3cd5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/docker-build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ jobs:
UGM_DEPLOY_VERSION=$(gh variable get UGM_BUILD_VERSION --env test)
gh variable set UGM_BUILD_VERSION --env main --body "$UGM_DEPLOY_VERSION"
elif [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == hotfix/* ]]; then
# 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]+')
VERSION_PATCH=$(echo "${{env.UGM_BUILD_VERSION}}" | grep -oE '[0-9]+$')
echo "Incrementing patch version for hotfix release"
# 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]+')
VERSION_PATCH=$(echo "${{env.UGM_BUILD_VERSION}}" | grep -oE '[0-9]+$')
echo "Incrementing patch version for hotfix release"
VERSION_PATCH=$((VERSION_PATCH + 1))
UGM_DEPLOY_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
fi
Expand Down
2 changes: 1 addition & 1 deletion applications/scripts/datafix-ab#001.sql
Original file line number Diff line number Diff line change
@@ -1 +1 @@
test 14
test 14.3
1 change: 0 additions & 1 deletion applications/scripts/datafix-ab#002.sql
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
test 14.2

0 comments on commit 97b3cd5

Please sign in to comment.