From b7818844d0ccfcba267d79df6e808dbb163b53ac Mon Sep 17 00:00:00 2001 From: Chen Weiguang Date: Thu, 11 Aug 2022 11:25:17 +0800 Subject: [PATCH] feat(build): update spark build from 3.2.1 to 3.2.2 --- .github/workflows/ci.yml | 98 ++++++++++++++++++++-------------------- CHANGELOG.md | 2 +- templates/ci.yml.tmpl | 4 +- templates/vars.yml | 8 ++-- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe2969c..c796137 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,184 +16,184 @@ jobs: matrix: version: - spark: "3.1.3" - java: "8" hadoop: "2.7.4" scala: "2.12" + java: "8" python: "3.7" - spark: "3.1.3" - java: "8" hadoop: "2.7.4" scala: "2.12" + java: "8" python: "3.8" - spark: "3.1.3" - java: "8" hadoop: "2.7.4" scala: "2.12" + java: "8" python: "3.9" - spark: "3.1.3" - java: "8" hadoop: "3.2.0" scala: "2.12" + java: "8" python: "3.7" - spark: "3.1.3" - java: "8" hadoop: "3.2.0" scala: "2.12" + java: "8" python: "3.8" - spark: "3.1.3" - java: "8" hadoop: "3.2.0" scala: "2.12" + java: "8" python: "3.9" - spark: "3.1.3" - java: "11" hadoop: "2.7.4" scala: "2.12" + java: "11" python: "3.7" - spark: "3.1.3" - java: "11" hadoop: "2.7.4" scala: "2.12" + java: "11" python: "3.8" - spark: "3.1.3" - java: "11" hadoop: "2.7.4" scala: "2.12" + java: "11" python: "3.9" - spark: "3.1.3" - java: "11" hadoop: "3.2.0" scala: "2.12" + java: "11" python: "3.7" - spark: "3.1.3" - java: "11" hadoop: "3.2.0" scala: "2.12" + java: "11" python: "3.8" - spark: "3.1.3" - java: "11" hadoop: "3.2.0" scala: "2.12" + java: "11" python: "3.9" - - spark: "3.2.1" - java: "8" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.12" - python: "3.7" - - spark: "3.2.1" java: "8" + python: "3.7" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.12" - python: "3.8" - - spark: "3.2.1" java: "8" + python: "3.8" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.12" - python: "3.9" - - spark: "3.2.1" java: "8" + python: "3.9" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.13" - python: "3.7" - - spark: "3.2.1" java: "8" + python: "3.7" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.13" - python: "3.8" - - spark: "3.2.1" java: "8" + python: "3.8" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.13" + java: "8" python: "3.9" - - spark: "3.2.1" - java: "11" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.12" - python: "3.7" - - spark: "3.2.1" java: "11" + python: "3.7" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.12" - python: "3.8" - - spark: "3.2.1" java: "11" + python: "3.8" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.12" - python: "3.9" - - spark: "3.2.1" java: "11" + python: "3.9" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.13" - python: "3.7" - - spark: "3.2.1" java: "11" + python: "3.7" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.13" - python: "3.8" - - spark: "3.2.1" java: "11" + python: "3.8" + - spark: "3.2.2" hadoop: "3.3.1" scala: "2.13" + java: "11" python: "3.9" - spark: "3.3.0" - java: "8" hadoop: "3.3.2" scala: "2.12" + java: "8" python: "3.7" - spark: "3.3.0" - java: "8" hadoop: "3.3.2" scala: "2.12" + java: "8" python: "3.8" - spark: "3.3.0" - java: "8" hadoop: "3.3.2" scala: "2.12" + java: "8" python: "3.9" - spark: "3.3.0" - java: "8" hadoop: "3.3.2" scala: "2.13" + java: "8" python: "3.7" - spark: "3.3.0" - java: "8" hadoop: "3.3.2" scala: "2.13" + java: "8" python: "3.8" - spark: "3.3.0" - java: "8" hadoop: "3.3.2" scala: "2.13" + java: "8" python: "3.9" - spark: "3.3.0" - java: "11" hadoop: "3.3.2" scala: "2.12" + java: "11" python: "3.7" - spark: "3.3.0" - java: "11" hadoop: "3.3.2" scala: "2.12" + java: "11" python: "3.8" - spark: "3.3.0" - java: "11" hadoop: "3.3.2" scala: "2.12" + java: "11" python: "3.9" - spark: "3.3.0" - java: "11" hadoop: "3.3.2" scala: "2.13" + java: "11" python: "3.7" - spark: "3.3.0" - java: "11" hadoop: "3.3.2" scala: "2.13" + java: "11" python: "3.8" - spark: "3.3.0" - java: "11" hadoop: "3.3.2" scala: "2.13" + java: "11" python: "3.9" runs-on: ubuntu-20.04 env: @@ -201,9 +201,9 @@ jobs: SELF_VERSION: "v5" BASE_VERSION: "v3" SPARK_VERSION: "${{ matrix.version.spark }}" - JAVA_VERSION: "${{ matrix.version.java }}" HADOOP_VERSION: "${{ matrix.version.hadoop }}" SCALA_VERSION: "${{ matrix.version.scala }}" + JAVA_VERSION: "${{ matrix.version.java }}" PYTHON_VERSION: "${{ matrix.version.python }}" steps: - name: Set up Java diff --git a/CHANGELOG.md b/CHANGELOG.md index c057c99..681727a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## v5 - Use non-versioned constant path for `py4j import. -- Build only for 3.1.3, 3.2.1 and 3.3.0, and their related supported Hadoop +- Build only for 3.1.3, 3.2.2 and 3.3.0, and their related supported Hadoop variants (dropped all 2.y.z versions). - Change base image version to `v3`. diff --git a/templates/ci.yml.tmpl b/templates/ci.yml.tmpl index 93f3c83..631ef70 100644 --- a/templates/ci.yml.tmpl +++ b/templates/ci.yml.tmpl @@ -22,9 +22,9 @@ jobs: {%- for scala in v.scala %} {%- for python in v.python %} - spark: "{{ spark }}" - java: "{{ java }}" hadoop: "{{ hadoop }}" scala: "{{ scala }}" + java: "{{ java }}" python: "{{ python }}" {%- endfor %} {%- endfor %} @@ -39,9 +39,9 @@ jobs: BASE_VERSION: "{{ base_version }}" {% raw -%} SPARK_VERSION: "${{ matrix.version.spark }}" - JAVA_VERSION: "${{ matrix.version.java }}" HADOOP_VERSION: "${{ matrix.version.hadoop }}" SCALA_VERSION: "${{ matrix.version.scala }}" + JAVA_VERSION: "${{ matrix.version.java }}" PYTHON_VERSION: "${{ matrix.version.python }}" {%- endraw %} steps: diff --git a/templates/vars.yml b/templates/vars.yml index 1f32dd5..95c2c94 100644 --- a/templates/vars.yml +++ b/templates/vars.yml @@ -3,19 +3,19 @@ base_version: "v3" versions: - spark: ["3.1.3"] - java: ["8", "11"] hadoop: ["2.7.4", "3.2.0"] scala: ["2.12"] + java: ["8", "11"] python: ["3.7", "3.8", "3.9"] -- spark: ["3.2.1"] - java: ["8", "11"] +- spark: ["3.2.2"] hadoop: ["3.3.1"] scala: ["2.12", "2.13"] + java: ["8", "11"] python: ["3.7", "3.8", "3.9"] - spark: ["3.3.0"] - java: ["8", "11"] hadoop: ["3.3.2"] scala: ["2.12", "2.13"] + java: ["8", "11"] python: ["3.7", "3.8", "3.9"]