Skip to content

Commit

Permalink
test 8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
DarylTodosichuk committed Oct 25, 2024
1 parent 837f85d commit 7a98d50
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 17 deletions.
12 changes: 4 additions & 8 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<!-- Provide a general summary of your changes in the Title -->
<!-- Provide a summary of changes in the PR Title -->

# Description

Please provide a summary of the change and the issue fixed. Please include relevant context. List dependency changes.
Please provide a summary of the change reference the issue fixed. Please include relevant context.

<!--
<!--
PR Title format: Feature/Number Title
Example: Feature/1234 A great feature
Example: Feature/AB#nnnn A great feature
-->

## Comments

<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
8 changes: 4 additions & 4 deletions .github/workflows/docker-build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ jobs:
run: |
MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///')
if [ -z "$MERGED_BRANCH" ]; then
echo "direct push not a pull request from bcgov/branch"
echo "MERGED_BRANCH='push'" >> $GITHUB_OUTPUT
echo "Direct push not a pull request from bcgov/branch"
echo "MERGED_BRANCH=push" >> $GITHUB_OUTPUT
else
echo "Merged branch: $MERGED_BRANCH"
echo "MERGED_BRANCH=$MERGED_BRANCH" >> $GITHUB_OUTPUT
Expand All @@ -89,11 +89,11 @@ jobs:
with:
fetch-depth: '0'
- name: Set repository version variables
id: setversion
id: set_version
run: |
gh variable list --env ${{env.TARGET_ENV}}
gh variable set UGM_BUILD_REVISION --env ${{env.TARGET_ENV}} --body "${{needs.Branch.outputs.SHA_SHORT}}}"
gh variable list --env ${{env.TARGET_ENV}}
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:
needs: [Setup,Branch,PushVariables]
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 @@ -104,10 +104,11 @@ jobs:
#
echo "${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
# Prepare tags
echo "gittag=${{env.UGM_RELEASE_PREFIX}}${MAJOR_VERSION}.${MINOR_VERSION}.${VERSION_PATCH}" >> $GITHUB_OUTPUT
echo "tagmsg=${{env.UGM_RELEASE_MESSAGE}} ${{steps.date-selector.outputs.date}}" >> $GITHUB_OUTPUT
echo "tagversion=$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" >> $GITHUB_OUTPUT
echo "TAGNAME=${{env.UGM_RELEASE_PREFIX}}${MAJOR_VERSION}.${MINOR_VERSION}.${VERSION_PATCH}" >> $GITHUB_OUTPUT
echo "TAGMSG=${{env.UGM_RELEASE_MESSAGE}} ${{needs.Setup.outputs.DATE}}" >> $GITHUB_OUTPUT
echo "TAGVERSION=$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH" >> $GITHUB_OUTPUT
- name: Create Git Tag
id: tag_create
run: |
git config user.name "GitHub Actions"
git config user.email "github-actions@users.noreply.github.com"
Expand All @@ -132,7 +133,9 @@ jobs:
gh variable list --env ${{env.TARGET_ENV}}
gh variable set UGM_BUILD_REVISION --env ${{env.TARGET_ENV}} --body "${{needs.Branch.outputs.SHA_SHORT}}"
gh variable set UGM_BUILD_VERSION --env ${{env.TARGET_ENV}} --body "${{needs.GenerateTag.outputs.TAGVERSION}}"
echo "..."
gh variable list --env ${{env.TARGET_ENV}}
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:
needs: [Setup,Branch,GenerateTag,PushVariables]
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/docker-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,14 @@ jobs:
gh variable list --env ${{env.TARGET_ENV}}
gh variable set UGM_BUILD_REVISION --env ${{env.TARGET_ENV}} --body "${{needs.Branch.outputs.SHA_SHORT}}"
gh variable set UGM_BUILD_VERSION --env ${{env.TARGET_ENV}} --body "${{needs.GenerateTag.outputs.TAGVERSION}}"
echo "..."
gh variable list --env ${{env.TARGET_ENV}}
# Update other environments version elements
gh variable set UGM_BUILD_VERSION --env dev --body "${{needs.GenerateTag.outputs.TAGVERSION}}"
gh variable get UGM_BUILD_VERSION --env dev
gh variable set UGM_BUILD_VERSION --env main --body "${{needs.GenerateTag.outputs.TAGVERSION}}"
gh variable get UGM_BUILD_VERSION --env main
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:
needs: [Setup,Branch,GenerateTag,PushVariables]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hotfix-build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Create PR into main from selected branch or tag
name: Patch - Hotfix create PR
name: Patch - Hotfix create PR into test/main

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion applications/scripts/datafix-ab#008.sql
Original file line number Diff line number Diff line change
@@ -1 +1 @@
test
test 1

0 comments on commit 7a98d50

Please sign in to comment.