test 7.3

bcgov · Oct 25, 2024 · 1326847 · 1326847
1 parent 6d47261
commit 1326847
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -72,7 +72,7 @@ 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 no PR"
+          echo "direct push no from bcgov/branch PR"
         else
           echo "Merged branch: $MERGED_BRANCH"
         fi

diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
@@ -70,9 +70,13 @@ jobs:
     - name: List merged branch
       id: get-branch
       run: |
-        echo "MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///')"  >> $GITHUB_OUTPUT
         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 no from bcgov/branch PR"
+        else
         echo "Merged branch: $MERGED_BRANCH"
+        fi
+        echo "MERGED_BRANCH=$MERGED_BRANCH" >> $GITHUB_OUTPUT
   GenerateTag:
     needs: [Setup]
     runs-on: ubuntu-latest

diff --git a/applications/scripts/datafix-ab#007.sql b/applications/scripts/datafix-ab#007.sql
@@ -1,2 +1,3 @@
 test 1
-test 2
+test 2
+test 3
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     test 1
-    test 2
+    test 2
+    test 3