From 3b4cdb99cecb799fa6d4b4d25e1ce4d3cdd0cba0 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Fri, 21 Oct 2022 15:43:55 +0800 Subject: [PATCH 1/3] upgrade --- .github/workflows/benchmark.yml | 4 ++-- .github/workflows/build_and_test.yml | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index f73267a95fa32..adaa8c4bfd420 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -105,7 +105,7 @@ jobs: run: cd tpcds-kit/tools && make OS=LINUX - name: Install Java ${{ github.event.inputs.jdk }} if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true' - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ github.event.inputs.jdk }} - name: Generate TPC-DS (SF=1) table data @@ -156,7 +156,7 @@ jobs: restore-keys: | benchmark-coursier-${{ github.event.inputs.jdk }} - name: Install Java ${{ github.event.inputs.jdk }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ github.event.inputs.jdk }} - name: Cache TPC-DS generated data diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 7ae6987bdabe4..7e6a70ed108a9 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -227,7 +227,7 @@ jobs: restore-keys: | ${{ matrix.java }}-${{ matrix.hadoop }}-coursier- - name: Install Java ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} - name: Install Python 3.8 @@ -384,7 +384,7 @@ jobs: restore-keys: | pyspark-coursier- - name: Install Java ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} - name: List Python packages (Python 3.9, PyPy3) @@ -473,7 +473,7 @@ jobs: restore-keys: | sparkr-coursier- - name: Install Java ${{ inputs.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ inputs.java }} - name: Run tests @@ -597,7 +597,7 @@ jobs: cd docs bundle install - name: Install Java 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 8 - name: Scala linter @@ -664,7 +664,7 @@ jobs: restore-keys: | java${{ matrix.java }}-maven- - name: Install Java ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} - name: Build with Maven @@ -713,7 +713,7 @@ jobs: restore-keys: | scala-213-coursier- - name: Install Java 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 8 - name: Build with SBT @@ -761,7 +761,7 @@ jobs: restore-keys: | tpcds-coursier- - name: Install Java 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 8 - name: Cache TPC-DS generated data @@ -864,7 +864,7 @@ jobs: restore-keys: | docker-integration-coursier- - name: Install Java 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 8 - name: Run tests @@ -921,7 +921,7 @@ jobs: restore-keys: | k8s-integration-coursier- - name: Install Java ${{ inputs.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: ${{ inputs.java }} - name: start minikube From 25c27d33c1ccdfbba5a8427f0eb5257b74d2b651 Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Fri, 21 Oct 2022 15:46:32 +0800 Subject: [PATCH 2/3] add distribution: 'zulu' --- .github/workflows/benchmark.yml | 2 ++ .github/workflows/build_and_test.yml | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index adaa8c4bfd420..5ccbbfa66178f 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -107,6 +107,7 @@ jobs: if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true' uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: ${{ github.event.inputs.jdk }} - name: Generate TPC-DS (SF=1) table data if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true' @@ -158,6 +159,7 @@ jobs: - name: Install Java ${{ github.event.inputs.jdk }} uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: ${{ github.event.inputs.jdk }} - name: Cache TPC-DS generated data if: contains(github.event.inputs.class, 'TPCDSQueryBenchmark') || contains(github.event.inputs.class, '*') diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 7e6a70ed108a9..d375c3812498a 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -229,6 +229,7 @@ jobs: - name: Install Java ${{ matrix.java }} uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: ${{ matrix.java }} - name: Install Python 3.8 uses: actions/setup-python@v2 @@ -386,6 +387,7 @@ jobs: - name: Install Java ${{ matrix.java }} uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: ${{ matrix.java }} - name: List Python packages (Python 3.9, PyPy3) run: | @@ -475,6 +477,7 @@ jobs: - name: Install Java ${{ inputs.java }} uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: ${{ inputs.java }} - name: Run tests env: ${{ fromJSON(inputs.envs) }} @@ -599,6 +602,7 @@ jobs: - name: Install Java 8 uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: 8 - name: Scala linter run: ./dev/lint-scala @@ -666,6 +670,7 @@ jobs: - name: Install Java ${{ matrix.java }} uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: ${{ matrix.java }} - name: Build with Maven run: | @@ -715,6 +720,7 @@ jobs: - name: Install Java 8 uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: 8 - name: Build with SBT run: | @@ -763,6 +769,7 @@ jobs: - name: Install Java 8 uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: 8 - name: Cache TPC-DS generated data id: cache-tpcds-sf-1 @@ -866,6 +873,7 @@ jobs: - name: Install Java 8 uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: 8 - name: Run tests run: | @@ -923,6 +931,7 @@ jobs: - name: Install Java ${{ inputs.java }} uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: ${{ inputs.java }} - name: start minikube run: | From 47d63e55d9fcdec8e92394e75b3392a4707dbe3f Mon Sep 17 00:00:00 2001 From: yangjie01 Date: Fri, 21 Oct 2022 15:49:34 +0800 Subject: [PATCH 3/3] add check-latest: true --- .github/workflows/benchmark.yml | 2 ++ .github/workflows/build_and_test.yml | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 5ccbbfa66178f..b9277ab920c31 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -109,6 +109,7 @@ jobs: with: distribution: 'zulu' java-version: ${{ github.event.inputs.jdk }} + check-latest: true - name: Generate TPC-DS (SF=1) table data if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true' run: build/sbt "sql/Test/runMain org.apache.spark.sql.GenTPCDSData --dsdgenDir `pwd`/tpcds-kit/tools --location `pwd`/tpcds-sf-1 --scaleFactor 1 --numPartitions 1 --overwrite" @@ -161,6 +162,7 @@ jobs: with: distribution: 'zulu' java-version: ${{ github.event.inputs.jdk }} + check-latest: true - name: Cache TPC-DS generated data if: contains(github.event.inputs.class, 'TPCDSQueryBenchmark') || contains(github.event.inputs.class, '*') id: cache-tpcds-sf-1 diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index d375c3812498a..b5a4f1d0a20b7 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -231,6 +231,7 @@ jobs: with: distribution: 'zulu' java-version: ${{ matrix.java }} + check-latest: true - name: Install Python 3.8 uses: actions/setup-python@v2 # We should install one Python that is higher then 3+ for SQL and Yarn because: @@ -389,6 +390,7 @@ jobs: with: distribution: 'zulu' java-version: ${{ matrix.java }} + check-latest: true - name: List Python packages (Python 3.9, PyPy3) run: | python3.9 -m pip list @@ -479,6 +481,7 @@ jobs: with: distribution: 'zulu' java-version: ${{ inputs.java }} + check-latest: true - name: Run tests env: ${{ fromJSON(inputs.envs) }} run: | @@ -604,6 +607,7 @@ jobs: with: distribution: 'zulu' java-version: 8 + check-latest: true - name: Scala linter run: ./dev/lint-scala - name: Java linter @@ -672,6 +676,7 @@ jobs: with: distribution: 'zulu' java-version: ${{ matrix.java }} + check-latest: true - name: Build with Maven run: | export MAVEN_OPTS="-Xss64m -Xmx2g -XX:ReservedCodeCacheSize=1g -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN" @@ -722,6 +727,7 @@ jobs: with: distribution: 'zulu' java-version: 8 + check-latest: true - name: Build with SBT run: | ./dev/change-scala-version.sh 2.13 @@ -771,6 +777,7 @@ jobs: with: distribution: 'zulu' java-version: 8 + check-latest: true - name: Cache TPC-DS generated data id: cache-tpcds-sf-1 uses: actions/cache@v2 @@ -875,6 +882,7 @@ jobs: with: distribution: 'zulu' java-version: 8 + check-latest: true - name: Run tests run: | ./dev/run-tests --parallelism 1 --modules docker-integration-tests --included-tags org.apache.spark.tags.DockerTest @@ -933,6 +941,7 @@ jobs: with: distribution: 'zulu' java-version: ${{ inputs.java }} + check-latest: true - name: start minikube run: | # See more in "Installation" https://minikube.sigs.k8s.io/docs/start/