moved java installation, code checkout and parameters validation to t…

…he main yml
firebolt-db · Nov 22, 2023 · 647638a · 647638a
1 parent 6bb960c
commit 647638a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 30 deletions.
diff --git a/.github/workflows/integration-test-v1.yml b/.github/workflows/integration-test-v1.yml
@@ -32,21 +32,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Validate database and engine
-        if: ${{ (github.event.inputs.database == '') != (github.event.inputs.engine == '') }}
-        uses: actions/github-script@v3
-        with:
-          script: |
-            core.setFailed("Database and Engine parameters should be provided simultaneously")
-
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Prepare java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '17'
       - name: Determine env variables
         run: |
           if [ "${{ github.event.inputs.environment }}" == 'staging' ]; then

diff --git a/.github/workflows/integration-test-v2.yml b/.github/workflows/integration-test-v2.yml
@@ -37,21 +37,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Validate database and engine
-        if: ${{ (github.event.inputs.database == '') != (github.event.inputs.engine == '') }}
-        uses: actions/github-script@v3
-        with:
-          script: |
-            core.setFailed("Database and Engine parameters should be provided simultaneously")
-
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Prepare java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '17'
       - name: Determine env variables
         run: |
           if [ "${{ github.event.inputs.environment }}" == 'staging' ]; then

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -47,8 +47,31 @@ on:
           - 'false'
 
 jobs:
+  setup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate database and engine
+        if: ${{ (github.event.inputs.run-v1 && (github.event.inputs.database1 == '' || github.event.inputs.engine1 == '')) ||  (github.event.inputs.run-v2 && (github.event.inputs.database2 == '' || github.event.inputs.engine2 == '')) }}
+        uses: actions/github-script@v3
+        with:
+          script: |
+            core.setFailed("Database and Engine parameters should be provided simultaneously")
+
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Prepare java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Build
+        run: ./gradlew build -x test
+
   run-integration-tests1:
     if: ${{ github.event.inputs.run-v1 }}
+    needs: [setup]
     uses: ./.github/workflows/integration-test-v1.yml
     with:
       database: ${{ github.event.inputs.database1 }}
@@ -62,6 +85,7 @@ jobs:
 
   run-integration-tests2:
     if: ${{ github.event.inputs.run-v2 }}
+    needs: [setup]
     uses: ./.github/workflows/integration-test-v2.yml
     with:
       database: ${{ github.event.inputs.database2 }}