Merge pull request #2450 from Fishbowler/db-test-before-publish

Always run database tests if we're gonna publish
igniterealtime · Mar 9, 2024 · 2cb9f45 · 2cb9f45
2 parents ddf144c + 423e618
commit 2cb9f45
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
@@ -230,9 +230,9 @@ jobs:
 
   sqlserver:
     name: Test SQL Server Upgrades
-    needs: [build, should-do-database-upgrade-tests]
+    needs: [build, should-do-database-upgrade-tests, check_branch]
     runs-on: ubuntu-latest
-    if: ${{ needs.should-do-database-upgrade-tests.outputs.check == 'true' }}
+    if: ${{ needs.should-do-database-upgrade-tests.outputs.check == 'true' || needs.check_branch.outputs.is_publishable_branch == 'true'}}
     steps:
       - name: Checkout Openfire
         uses: actions/checkout@v4
@@ -271,9 +271,9 @@ jobs:
 
   postgres:
     name: Test Postgres Upgrades
-    needs: [build, should-do-database-upgrade-tests]
+    needs: [build, should-do-database-upgrade-tests, check_branch]
     runs-on: ubuntu-latest
-    if: ${{ needs.should-do-database-upgrade-tests.outputs.check == 'true' }}
+    if: ${{ needs.should-do-database-upgrade-tests.outputs.check == 'true' || needs.check_branch.outputs.is_publishable_branch == 'true'}}
     steps:
       - name: Checkout Openfire
         uses: actions/checkout@v4
@@ -312,9 +312,9 @@ jobs:
 
   mysql:
     name: Test MySQL Upgrades
-    needs: [build, should-do-database-upgrade-tests]
+    needs: [build, should-do-database-upgrade-tests, check_branch]
     runs-on: ubuntu-latest
-    if: ${{ needs.should-do-database-upgrade-tests.outputs.check == 'true' }}
+    if: ${{ needs.should-do-database-upgrade-tests.outputs.check == 'true' || needs.check_branch.outputs.is_publishable_branch == 'true'}}
     steps:
       - name: Checkout Openfire
         uses: actions/checkout@v4
@@ -351,10 +351,9 @@ jobs:
           java -jar ./target/updaterunner-1.0.0-jar-with-dependencies.jar
 
   publish-maven:
-
     name: Publish to Maven
     runs-on: ubuntu-latest
-    needs: [aioxmpp, connectivity, smack, check_branch]
+    needs: [aioxmpp, connectivity, smack, check_branch, sqlserver, postgres, mysql]
     if: ${{github.repository == 'igniterealtime/Openfire' && github.event_name == 'push' && needs.check_branch.outputs.is_publishable_branch == 'true'}}
 
     steps: