Merge pull request #137 from bcgov/bugfix/AB#00005-git-logs

test 11.3.2
bcgov · Oct 29, 2024 · 4ae95cf · 4ae95cf
2 parents f7a5c49 + 55e9a7f
commit 4ae95cf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/docker-build-dev.yml b/.github/workflows/docker-build-dev.yml
@@ -69,7 +69,6 @@ jobs:
     - name: List merged branch
       id: get_branch
       run: |
-        git log --merges --pretty=format:"%s" -1 | grep -oE 'from bcgov/[^ ]+'
         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 pull request from bcgov/branch"

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