Skip to content

Commit

Permalink
feat(build): update spark build from 3.2.1 to 3.2.2 (#57)
Browse files Browse the repository at this point in the history
  • Loading branch information
@guangie88
guangie88 authored Aug 11, 2022
1 parent db62476 commit 8f4b76a
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 56 deletions.
98 changes: 49 additions & 49 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,194 +16,194 @@ 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:
IMAGE_NAME: spark-k8s-addons
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
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down
4 changes: 2 additions & 2 deletions templates/ci.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions templates/vars.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

0 comments on commit 8f4b76a

Please sign in to comment.