From 7a98d509b7b68b4c07eb0d7eca5d7083c7950dd1 Mon Sep 17 00:00:00 2001 From: Daryl Todosichuk Date: Fri, 25 Oct 2024 13:15:09 -0700 Subject: [PATCH] test 8.1 --- .github/pull_request_template.md | 12 ++++-------- .github/workflows/docker-build-dev.yml | 8 ++++---- .github/workflows/docker-build-main.yml | 9 ++++++--- .github/workflows/docker-build-test.yml | 2 ++ .github/workflows/hotfix-build.yml | 2 +- applications/scripts/datafix-ab#008.sql | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index b5b795a..c791a89 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,14 +1,10 @@ - + # 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. - - -## Comments - - diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml index b6827bc..0c541e5 100644 --- a/.github/workflows/docker-build-dev.yml +++ b/.github/workflows/docker-build-dev.yml @@ -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 @@ -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] diff --git a/.github/workflows/docker-build-main.yml b/.github/workflows/docker-build-main.yml index de5345f..40a12f2 100644 --- a/.github/workflows/docker-build-main.yml +++ b/.github/workflows/docker-build-main.yml @@ -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" @@ -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] diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index 4c64dd9..67de4ca 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -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] diff --git a/.github/workflows/hotfix-build.yml b/.github/workflows/hotfix-build.yml index 055e3b6..2c724d0 100644 --- a/.github/workflows/hotfix-build.yml +++ b/.github/workflows/hotfix-build.yml @@ -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: diff --git a/applications/scripts/datafix-ab#008.sql b/applications/scripts/datafix-ab#008.sql index 30d74d2..4f67a83 100644 --- a/applications/scripts/datafix-ab#008.sql +++ b/applications/scripts/datafix-ab#008.sql @@ -1 +1 @@ -test \ No newline at end of file +test 1 \ No newline at end of file