diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 748aeff0599..9392645382d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,9 +65,6 @@ jobs: build: # The type of runner that the job will run on runs-on: ubuntu-latest - strategy: - matrix: - java-version: [ 8, 11, 17 ] timeout-minutes: 30 needs: changes if: needs.changes.outputs.source_changes == 'true' @@ -78,11 +75,11 @@ jobs: - uses: actions/setup-java@v3 with: - java-version: ${{ matrix.java-version }} + java-version: 8 distribution: 'temurin' - name: Build with Gradle - run: ./gradlew build -PskipITs -PjdkVersion=${{ matrix.java-version }} + run: ./gradlew build -PskipITs -PjdkVersion=8 - name: Upload unit tests report uses: actions/upload-artifact@v3 diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 51ad704ecaf..68acbd268e4 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -7,6 +7,11 @@ on: branches: [ "main", "branch-*" ] pull_request: branches: [ "main", "branch-*" ] + workflow_run: + workflows: + - build + types: + - completed concurrency: group: ${{ github.worklfow }}-${{ github.event.pull_request.number || github.ref }} @@ -46,10 +51,24 @@ jobs: outputs: source_changes: ${{ steps.filter.outputs.source_changes }} + get_workflow_conclusion: + name: Lookup Conclusion of Workflow_Run Event + runs-on: ubuntu-latest + outputs: + conclusion: ${{ fromJson(steps.get_conclusion.outputs.data).conclusion }} + steps: + - name: Get Workflow Run + uses: octokit/request-action@v2.1.0 + id: get_conclusion + with: + route: GET /repos/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Integration test for AMD64 architecture test-amd64-arch: - needs: changes - if: needs.changes.outputs.source_changes == 'true' + needs: [changes, get_workflow_conclusion] + if: needs.changes.outputs.source_changes == 'true' && needs.get_workflow_conclusion.outputs.get_workflow_conclusion == 'success' runs-on: ubuntu-latest timeout-minutes: 30 strategy: