fix action logic

kartoza · Oct 15, 2024 · c7fed8f · c7fed8f
1 parent 21685b4
commit c7fed8f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml
@@ -25,8 +25,10 @@ jobs:
     timeout-minutes: 5
     if: |
       github.actor != 'dependabot[bot]' &&
-      (!contains(github.event.comment.body, '/skiprelease') ||
-      !contains(github.event.comment.title, '[skiprelease]'))
+      !(
+        contains(github.event.pull_request.title, '[skip-release]') ||
+        contains(github.event.comment.body, '/skiprelease')
+      )
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
@@ -58,8 +60,10 @@ jobs:
     timeout-minutes: 15
     if: |
       github.actor != 'dependabot[bot]' &&
-      (!contains(github.event.comment.body, '/skiprelease') ||
-      !contains(github.event.comment.title, '[skiprelease]'))
+      !(
+        contains(github.event.pull_request.title, '[skip-release]') ||
+        contains(github.event.comment.body, '/skiprelease')
+      )
     strategy:
       matrix:
         geoserverMajorVersion:
@@ -135,8 +139,10 @@ jobs:
     timeout-minutes: 20
     if: |
       github.actor != 'dependabot[bot]' &&
-      (!contains(github.event.comment.body, '/skiprelease') ||
-      !contains(github.event.comment.title, '[skiprelease]'))
+      !(
+        contains(github.event.pull_request.title, '[skip-release]') ||
+        contains(github.event.comment.body, '/skiprelease')
+      )
     needs: [build-geoserver-docker-image, run-scenario-tests]
     steps:
       - uses: actions/checkout@v4
@@ -168,8 +174,10 @@ jobs:
     timeout-minutes: 20
     if: |
       github.actor != 'dependabot[bot]' &&
-      (!contains(github.event.comment.body, '/skiprelease') ||
-      !contains(github.event.comment.title, '[skiprelease]'))
+      !(
+        contains(github.event.pull_request.title, '[skip-release]') ||
+        contains(github.event.comment.body, '/skiprelease')
+      )
     needs: [ build-geoserver-docker-image, build-activemq-docker-image]
     strategy:
       matrix:
@@ -216,8 +224,10 @@ jobs:
       github.event_name == 'pull_request' && 
       github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url && 
       github.actor != 'dependabot[bot]'  &&
-      (!contains(github.event.comment.body, '/skiprelease') ||
-      !contains(github.event.comment.title, '[skiprelease]'))
+      !(
+        contains(github.event.pull_request.title, '[skip-release]') ||
+        contains(github.event.comment.body, '/skiprelease')
+      )
     runs-on: ubuntu-latest
     timeout-minutes: 20
     needs: [ build-geoserver-docker-image, run-scenario-tests ]

diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml
@@ -14,8 +14,10 @@ jobs:
   deploy-image:
     if: |
       github.actor != 'dependabot[bot]' &&
-      (!contains(github.event.comment.body, '/skiprelease') ||
-      !contains(github.event.comment.title, '[skiprelease]'))
+      !(
+        contains(github.event.pull_request.title, '[skip-release]') ||
+        contains(github.event.comment.body, '/skiprelease')
+      ) && github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     timeout-minutes: 15
     env:
@@ -83,8 +85,10 @@ jobs:
     timeout-minutes: 5
     if: |
       github.actor != 'dependabot[bot]' &&
-      (!contains(github.event.comment.body, '/skiprelease') ||
-      !contains(github.event.comment.title, '[skiprelease]'))
+      !(
+        contains(github.event.pull_request.title, '[skip-release]') ||
+        contains(github.event.comment.body, '/skiprelease') 
+      ) && github.event.workflow_run.conclusion == 'success'
     needs: [deploy-image]
     strategy:
       matrix: