diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml index 778a79db7618..b2ad4dfb8e65 100644 --- a/.github/workflows/static-checks.yml +++ b/.github/workflows/static-checks.yml @@ -17,14 +17,14 @@ name: "Static Checks CI" on: push: branches: - - master - - '[0-9]+.[0-9]+.[0-9]+' # release branches - - '[0-9]+.[0-9]+.[0-9]+-[A-Za-z0-9]+' # release branches - pull_request: - branches: - - master - - '[0-9]+.[0-9]+.[0-9]+' # release branches - - '[0-9]+.[0-9]+.[0-9]+-[A-Za-z0-9]+' # release branches + - nonexistingbranch +# - '[0-9]+.[0-9]+.[0-9]+' # release branches +# - '[0-9]+.[0-9]+.[0-9]+-[A-Za-z0-9]+' # release branches +# pull_request: +# branches: +# - master +# - '[0-9]+.[0-9]+.[0-9]+' # release branches +# - '[0-9]+.[0-9]+.[0-9]+-[A-Za-z0-9]+' # release branches concurrency: group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}' # group workflows only on pull_requests and not on branch commits diff --git a/.github/workflows/unit-and-integration-tests-unified.yml b/.github/workflows/unit-and-integration-tests-unified.yml index 81375f33c090..db438097751a 100644 --- a/.github/workflows/unit-and-integration-tests-unified.yml +++ b/.github/workflows/unit-and-integration-tests-unified.yml @@ -157,43 +157,36 @@ jobs: echo ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }} docker save "${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }}" | gzip > druid-container-jdk${{ matrix.jdk }}-version${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION }}.tar.gz - unit-tests-phase2: - strategy: - fail-fast: false - matrix: - # Use JDK 21.0.4 to work around https://github.com/apache/druid/issues/17429 - jdk: [ '11', '21.0.4' ] - name: "unit tests (jdk${{ matrix.jdk }}, sql-compat=true)" - uses: ./.github/workflows/unit-tests.yml - needs: unit-tests - if: ${{ always() && (needs.unit-tests.result == 'success' || needs.unit-tests.outputs.continue_tests) }} - with: - jdk: ${{ matrix.jdk }} - sql_compatibility: true - - unit-tests: - strategy: - fail-fast: false - matrix: - sql_compatibility: [ false, true ] - name: "unit tests (jdk17, sql-compat=${{ matrix.sql_compatibility }})" - uses: ./.github/workflows/unit-tests.yml - needs: build - with: - jdk: 17 - sql_compatibility: ${{ matrix.sql_compatibility }} +# unit-tests-phase2: +# strategy: +# fail-fast: false +# matrix: +# # Use JDK 21.0.4 to work around https://github.com/apache/druid/issues/17429 +# jdk: [ '11', '21.0.4' ] +# name: "unit tests (jdk${{ matrix.jdk }})" +# uses: ./.github/workflows/unit-tests.yml +# needs: unit-tests +# if: ${{ always() && (needs.unit-tests.result == 'success' || needs.unit-tests.outputs.continue_tests) }} +# with: +# jdk: ${{ matrix.jdk }} + +# unit-tests: +# name: "unit tests (jdk17)" +# uses: ./.github/workflows/unit-tests.yml +# needs: build +# with: +# jdk: 17 standard-its: - needs: unit-tests - if: ${{ always() && (needs.unit-tests.result == 'success' || needs.unit-tests.outputs.continue_tests) }} + needs: build uses: ./.github/workflows/standard-its.yml - revised-its: - needs: [unit-tests, set-env-var] - if: ${{ always() && (needs.unit-tests.result == 'success' || needs.unit-tests.outputs.continue_tests) }} - uses: ./.github/workflows/revised-its.yml - with: - BACKWARD_COMPATIBILITY_IT_ENABLED: ${{ needs.set-env-var.outputs.BACKWARD_COMPATIBILITY_IT_ENABLED }} - DRUID_PREVIOUS_VERSION: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION }} - DRUID_PREVIOUS_VERSION_DOWNLOAD_URL: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION_DOWNLOAD_URL }} - DRUID_PREVIOUS_IT_IMAGE_NAME: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }} +# revised-its: +# needs: [unit-tests, set-env-var] +# if: ${{ always() && (needs.unit-tests.result == 'success' || needs.unit-tests.outputs.continue_tests) }} +# uses: ./.github/workflows/revised-its.yml +# with: +# BACKWARD_COMPATIBILITY_IT_ENABLED: ${{ needs.set-env-var.outputs.BACKWARD_COMPATIBILITY_IT_ENABLED }} +# DRUID_PREVIOUS_VERSION: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION }} +# DRUID_PREVIOUS_VERSION_DOWNLOAD_URL: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_VERSION_DOWNLOAD_URL }} +# DRUID_PREVIOUS_IT_IMAGE_NAME: ${{ needs.set-env-var.outputs.DRUID_PREVIOUS_IT_IMAGE_NAME }}