chore: Validate flyway on push to main (#289)

ls1intum · Jan 31, 2025 · 98f4634 · 98f4634
1 parent 4ff2a34
commit 98f4634
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/flyway-validate.yml b/.github/workflows/flyway-validate.yml
@@ -3,6 +3,7 @@ name: Flyway Validation
 on:
   pull_request:
     branches: [main]
+  workflow_call: {}
 
 env:
   FLYWAY_URL: jdbc:postgresql://localhost:5432/helios
@@ -36,12 +37,14 @@ jobs:
           fetch-depth: 0
 
       - name: Fetch all branches
+        if: github.event_name == 'pull_request'
         run: |
           git fetch origin ${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
           git fetch origin ${{ github.head_ref }}:refs/remotes/origin/${{ github.head_ref }}
 
       - name: Check for changes
         id: check_changes
+        if: github.event_name == 'pull_request'
         run: |
           CHANGED_PATHS=$(git diff --name-status origin/${{ github.base_ref }} origin/${{ github.head_ref }} | grep -E "server/application-server/src/main/resources/db/migration/" || true)
 
@@ -62,18 +65,18 @@ jobs:
           fi
 
       - name: Set up Java
-        if: steps.check_changes.outputs.CHANGE_DETECTED == 'true'
+        if: steps.check_changes.outputs.CHANGE_DETECTED == 'true' || github.event_name == 'push'
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: "21"
 
       - name: Run Gradle to apply Flyway migrations
-        if: steps.check_changes.outputs.CHANGE_DETECTED == 'true'
+        if: steps.check_changes.outputs.CHANGE_DETECTED == 'true' || github.event_name == 'push'
         working-directory: ./server/application-server
         run: ./gradlew flywayMigrate
 
       - name: Run Gradle to validate Flyway migrations
-        if: steps.check_changes.outputs.CHANGE_DETECTED == 'true'
+        if: steps.check_changes.outputs.CHANGE_DETECTED == 'true' || github.event_name == 'push'
         working-directory: ./server/application-server
         run: ./gradlew flywayValidate
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -5,6 +5,8 @@ on:
     branches: [main]
 
 jobs:
+  validate-flyway:
+    uses: ./.github/workflows/flyway-validate.yml
   build-prod-container:
     uses: ./.github/workflows/build_docker.yml
     secrets: inherit
@@ -16,4 +18,4 @@ jobs:
       environment: production
       client_image_tag: "latest"
       application_server_image_tag: "latest"
-      webhook_listener_image_tag: "latest"
+      webhook_listener_image_tag: "latest"