From 3592e4672a9e1fd7712048ecfadd1949e169a2f8 Mon Sep 17 00:00:00 2001 From: TP Date: Mon, 1 Jun 2026 14:13:37 +0800 Subject: [PATCH 01/15] Add --sdk to Breeze to install toolchain --- .github/workflows/ci-amd.yml | 6 +- .github/workflows/ci-arm.yml | 6 +- .github/workflows/codeql-analysis.yml | 5 +- Dockerfile.ci | 4 ++ dev/breeze/doc/images/output_shell.svg | 16 +++-- dev/breeze/doc/images/output_shell.txt | 2 +- .../airflow_breeze/commands/common_options.py | 9 +++ .../commands/developer_commands.py | 4 ++ .../commands/developer_commands_config.py | 1 + .../src/airflow_breeze/global_constants.py | 3 + .../src/airflow_breeze/params/shell_params.py | 3 + java-sdk/build.gradle.kts | 11 ++- scripts/docker/entrypoint_ci.sh | 4 ++ scripts/docker/install_jdk.sh | 69 +++++++++++++++++++ 14 files changed, 132 insertions(+), 11 deletions(-) create mode 100755 scripts/docker/install_jdk.sh diff --git a/.github/workflows/ci-amd.yml b/.github/workflows/ci-amd.yml index 7c4f563007222..3fc942e4d9a5c 100644 --- a/.github/workflows/ci-amd.yml +++ b/.github/workflows/ci-amd.yml @@ -974,7 +974,11 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false - # keep this in sync with the jvmTarget in java-sdk/build.gradle.kts + # Keep this version in sync with: + # - jvmTarget and languageVersion in java-sdk/build.gradle.kts + # - TEMURIN_VERSION in scripts/docker/install_jdk.sh + # - java-version in .github/workflows/ci-amd.yml and .github/workflows/ci-arm.yml + # - java-version in .github/workflows/codeql-analysis.yml - name: Setup Java uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml index b750c4a949c14..7024bfbc34f15 100644 --- a/.github/workflows/ci-arm.yml +++ b/.github/workflows/ci-arm.yml @@ -964,7 +964,11 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false - # keep this in sync with the jvmTarget in java-sdk/build.gradle.kts + # Keep this version in sync with: + # - jvmTarget and languageVersion in java-sdk/build.gradle.kts + # - TEMURIN_VERSION in scripts/docker/install_jdk.sh + # - java-version in .github/workflows/ci-amd.yml and .github/workflows/ci-arm.yml + # - java-version in .github/workflows/codeql-analysis.yml - name: Setup Java uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ce46330319a65..4f820eb7e8521 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -96,7 +96,10 @@ jobs: with: persist-credentials: false - # keep this in sync with the jvmTarget in java-sdk/build.gradle.kts + # Keep this version in sync with: + # - jvmTarget and languageVersion in java-sdk/build.gradle.kts + # - TEMURIN_VERSION in scripts/docker/install_jdk.sh + # - java-version in .github/workflows/ci-amd.yml and .github/workflows/ci-arm.yml - name: Setup Java if: matrix.language == 'java' uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 diff --git a/Dockerfile.ci b/Dockerfile.ci index 2379df5129777..144b118ad69f8 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1222,6 +1222,10 @@ function environment_initialization() { export AIRFLOW__SCHEDULER__GO_WORKER=True fi + if [[ ${INSTALL_SDK_JAVA=} == "true" ]]; then + "${AIRFLOW_SOURCES}/scripts/docker/install_jdk.sh" + fi + RUN_TESTS=${RUN_TESTS:="false"} CI=${CI:="false"} diff --git a/dev/breeze/doc/images/output_shell.svg b/dev/breeze/doc/images/output_shell.svg index 3d183fe886dd7..da26b3d82340a 100644 --- a/dev/breeze/doc/images/output_shell.svg +++ b/dev/breeze/doc/images/output_shell.svg @@ -1,4 +1,4 @@ - +