test 7.7

bcgov · Oct 25, 2024 · f4ffd44 · f4ffd44
1 parent 205a51d
commit f4ffd44
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -87,16 +87,16 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
-          fetch-depth: '0'   
+          fetch-depth: '0'
     - name: Set repository version variables
       id: setversion
-      run: | 
+      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 "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]
+    needs: [Setup,Branch,PushVariables]
     runs-on: ubuntu-latest
     environment: dev
     steps:
@@ -117,7 +117,7 @@ jobs:
       run: |
         echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
     - name: Push application images to Artifactory container registry
-      run:  | 
+      run:  |
         docker tag dotnetapp $JFROG_SERVICE/$JFROG_REPO_PATH/dotnetapp
         docker push $JFROG_SERVICE/$JFROG_REPO_PATH/dotnetapp
         docker tag aspnetapp $JFROG_SERVICE/$JFROG_REPO_PATH/aspnetapp
@@ -135,7 +135,7 @@ jobs:
         oc registry login
         docker login -u unused -p $(oc whoami -t) $OC_REGISTRY
     - name: Push application images to OpenShift container registry
-      run:  | 
+      run:  |
         docker tag dotnetapp $OC_REGISTRY/$OC_TARGET_PROJECT/dotnetapp
         docker push $OC_REGISTRY/$OC_TARGET_PROJECT/dotnetapp
         docker tag aspnetapp $OC_REGISTRY/$OC_TARGET_PROJECT/aspnetapp

diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
@@ -99,7 +99,7 @@ jobs:
         echo "${{env.UGM_RELEASE_PREFIX}}$MAJOR_VERSION.$MINOR_VERSION.$VERSION_PATCH"
         MINOR_VERSION=$((MINOR_VERSION + 1))
         #
-        # If test patch is not 0 and from branch is dev set to 0 
+        # If test patch is not 0 and from branch is dev set to 0
         # If test patch is not 0 and from branch is hotfix increment patch
         #
         VERSION_PATCH=0
@@ -124,10 +124,14 @@ jobs:
     needs: [Setup,Branch,GenerateTag]
     runs-on: ubuntu-latest
     environment: test
-    steps:      
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+          fetch-depth: '0'
     - name: Set repository version variable
       id: set_version
-      run: | 
+      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 set UGM_BUILD_VERSION --env ${{env.TARGET_ENV}} --body "${{needs.GenerateTag.outputs.TAGVERSION}}"
@@ -139,7 +143,7 @@ jobs:
         gh variable get UGM_BUILD_VERSION --env main
         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]
+    needs: [Setup,Branch,GenerateTag,PushVariables]
     runs-on: ubuntu-latest
     environment: test
     steps:
@@ -160,7 +164,7 @@ jobs:
       run: |
         echo "$JFROG_PASSWORD" | docker login -u "$JFROG_USERNAME" --password-stdin $JFROG_SERVICE
     - name: Push application images to Artifactory container registry
-      run:  | 
+      run:  |
         docker tag dotnetapp $JFROG_SERVICE/$JFROG_REPO_PATH/dotnetapp
         docker push $JFROG_SERVICE/$JFROG_REPO_PATH/dotnetapp
         docker tag aspnetapp $JFROG_SERVICE/$JFROG_REPO_PATH/aspnetapp
@@ -178,7 +182,7 @@ jobs:
         oc registry login
         docker login -u unused -p $(oc whoami -t) $OC_REGISTRY
     - name: Push application images to OpenShift container registry
-      run:  | 
+      run:  |
         docker tag dotnetapp $OC_REGISTRY/$OC_TARGET_PROJECT/dotnetapp
         docker push $OC_REGISTRY/$OC_TARGET_PROJECT/dotnetapp
         docker tag aspnetapp $OC_REGISTRY/$OC_TARGET_PROJECT/aspnetapp

diff --git a/applications/scripts/datafix-ab#007.sql b/applications/scripts/datafix-ab#007.sql
@@ -3,4 +3,5 @@ test 2
 test 3
 test 4
 test 5
-test 6
+test 6
+test 7
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,5 @@ test 2 @@
     test 3
     test 4
     test 5
-    test 6
+    test 6
+    test 7