From 80b4be25b3a6d7bd2c877e679b7f70145759063b Mon Sep 17 00:00:00 2001 From: semyonsinchenko Date: Tue, 25 Feb 2025 08:35:36 +0100 Subject: [PATCH] Replace setup-scala action + force scalfmt checkAll during the CI --- .github/workflows/python-ci.yml | 5 +++-- .github/workflows/scala-ci.yml | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 1095ce49e..9632ca9a6 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -18,9 +18,10 @@ jobs: SCALA_VERSION: ${{ matrix.scala-version }} steps: - uses: actions/checkout@v4 - - uses: olafurpg/setup-scala@v13 + - uses: actions/setup-java@v4 with: - java-version: "openjdk@1.11" + distribution: "zulu" + java-version: "11" - uses: actions/cache@v4 with: path: | diff --git a/.github/workflows/scala-ci.yml b/.github/workflows/scala-ci.yml index bee91ff43..1e4c04a58 100644 --- a/.github/workflows/scala-ci.yml +++ b/.github/workflows/scala-ci.yml @@ -18,14 +18,17 @@ jobs: JVM_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8 steps: - uses: actions/checkout@v4 - - uses: olafurpg/setup-scala@v13 + - uses: actions/setup-java@v4 with: - java-version: "openjdk@1.11" + distribution: "zulu" + java-version: "11" - uses: actions/cache@v4 with: path: | ~/.ivy2/cache key: sbt-ivy-cache-spark-${{ matrix.spark-version}}-scala-${{ matrix.scala-version }} + - name: Check scalafmt + run: build/sbt root/scalafmtCheckAll - name: Build and Test run: build/sbt -v ++${{ matrix.scala-version }} -Dspark.version=${{ matrix.spark-version }} coverage test coverageReport - uses: codecov/codecov-action@v3