Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test 14.2 #167

Merged
merged 1 commit into from
Oct 29, 2024
+13 −16
Merged

test 14.2 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions .github/workflows/docker-build-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,27 +91,23 @@ jobs:
- name: Generate Next Git Tag
id: tag_selector
run: |
echo "Main branch 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)
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 the current version
echo "${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
# Check the merged branch and set versions accordingly
if [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == "test" ]]; then
UGM_TEST_VERSION=$(gh variable get UGM_BUILD_VERSION --env test)
gh variable set UGM_BUILD_VERSION --env main --body "$UGM_TEST_VERSION"
echo "Latest test version tagged as stable release: $UGM_TEST_VERSION"
echo "TAGNAME=${{env.UGM_RELEASE_PREFIX}}$UGM_TEST_VERSION" >> $GITHUB_OUTPUT
echo "TAGVERSION=$UGM_TEST_VERSION" >> $GITHUB_OUTPUT
elif [[ "${{ needs.Branch.outputs.MERGED_BRANCH }}" == hotfix/* ]]; then
echo "Incrementing patch version for hotfix release"
echo "Incrementing patch version for hotfix release"
VERSION_PATCH=$((VERSION_PATCH + 1))
UGM_HOTFIX_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
echo "Hotfix branch tagged as stable release: $UGM_TEST_VERSION"
echo "TAGNAME=${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" >> $GITHUB_OUTPUT
echo "TAGVERSION=$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" >> $GITHUB_OUTPUT
UGM_DEPLOY_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
fi
echo "Main branch tagged as stable release: $UGM_DEPLOY_VERSION"
echo "TAGNAME=${{env.UGM_RELEASE_PREFIX}}$UGM_DEPLOY_VERSION" >> $GITHUB_OUTPUT
echo "TAGVERSION=$UGM_DEPLOY_VERSION" >> $GITHUB_OUTPUT
echo "TAGMSG=${{env.UGM_RELEASE_MESSAGE}} ${{needs.Setup.outputs.DATE}}" >> $GITHUB_OUTPUT
- name: Create Git Tag
id: tag_create
Expand All @@ -128,8 +124,8 @@ jobs:
git push origin "${{steps.tag_selector.outputs.TAGNAME}}"
fi
outputs:
TAGNAME: ${{steps.tag_selector.outputs.TAGNAME}}
TAGMSG: ${{steps.tag_selector.outputs.TAGMSG}}
TAGNAME: ${{steps.tag_selector.outputs.TAGNAME}}
TAGVERSION: ${{steps.tag_selector.outputs.TAGVERSION}}
PushVariables:
needs: [Setup,Branch,GenerateTag]
Expand Down
1 change: 1 addition & 0 deletions applications/scripts/datafix-ab#002.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test 14.2