test 7.1

bcgov · Oct 25, 2024 · 1e4a2d8 · 1e4a2d8
1 parent b5b0fb3
commit 1e4a2d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -70,8 +70,8 @@ jobs:
     - name: List merged branch
       id: get-branch
       run: |
-        echo "MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1)"  >> $GITHUB_OUTPUT
-        MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1)
+        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\///')
         echo "Merged branch: $MERGED_BRANCH"
     - name: Set repository version variables
       id: setversion

diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
@@ -70,8 +70,8 @@ jobs:
     - name: List merged branch
       id: get-branch
       run: |
-        echo "MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1)"  >> $GITHUB_OUTPUT
-        MERGED_BRANCH=$(git log --merges --pretty=format:"%s" -1)
+        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\///')
         echo "Merged branch: $MERGED_BRANCH"
   GenerateTag:
     needs: [Setup]

diff --git a/applications/scripts/datafix-ab#007.sql b/applications/scripts/datafix-ab#007.sql
@@ -1 +1 @@
-test 
+test 1