Merge pull request #150 from bcgov/bugfix/AB#0006-merges

test 11.8
bcgov · Oct 29, 2024 · 32223eb · 32223eb
2 parents 8e854f1 + 3255441
commit 32223eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -69,8 +69,7 @@ jobs:
     - name: List merged branch
       id: get_branch
       run: |
-        git log
-        git log -1 | grep -oE 'from bcgov/[^ ]+'
+        git log -1
         MERGED_BRANCH=$(git log -1 | grep -oE 'from bcgov/[^ ]+' | sed 's/from bcgov\///')
         if [ -z "$MERGED_BRANCH" ]; then
           echo "Direct push into --env ${{env.TARGET_ENV}}"

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