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.

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 15 #171

Merged
merged 1 commit into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/docker-build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/docker-build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/docker-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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]+')
Expand All @@ -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:
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.3
test 15
Empty file.