From 87b9c8776535d01ac7ce2110703cd340f3cd0920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Ko=C5=82odziejczyk?= Date: Wed, 8 Jan 2025 13:55:22 +0100 Subject: [PATCH] fix: sbt installed explicitly in the runner image in the setup stage (#7394) --- .github/workflows/benchmark-e2e.yml | 6 +++--- .github/workflows/benchmark-jmh.yml | 6 +++--- .github/workflows/pr.yml | 6 ++++++ .github/workflows/release.yml | 2 ++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/benchmark-e2e.yml b/.github/workflows/benchmark-e2e.yml index 53fbc280bed..34891080076 100644 --- a/.github/workflows/benchmark-e2e.yml +++ b/.github/workflows/benchmark-e2e.yml @@ -10,10 +10,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Scala - uses: olafurpg/setup-scala@v10 + - uses: coursier/setup-action@v1 with: - java-version: "openjdk@1.11" + jvm: temurin:1.11.0.17 + - uses: sbt/setup-sbt@v1 - name: Run benchmarks run: | bash -c "export NUSSKNACKER_SCALA_VERSION=2.12 && sbt \"benchmarks/test:runMain pl.touk.nussknacker.engine.benchmarks.e2e.FlinkSteamingScenarioBenchmark 10000000\"" diff --git a/.github/workflows/benchmark-jmh.yml b/.github/workflows/benchmark-jmh.yml index 26219fbf17e..6ef768f45f3 100644 --- a/.github/workflows/benchmark-jmh.yml +++ b/.github/workflows/benchmark-jmh.yml @@ -10,10 +10,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Setup Scala - uses: olafurpg/setup-scala@v10 + - uses: coursier/setup-action@v1 with: - java-version: "openjdk@1.11" + jvm: temurin:1.11.0.17 + - uses: sbt/setup-sbt@v1 - name: Run benchmarks run: sbt "benchmarks/jmh:run -i 8 -wi 3 -f1 -t1 -rf csv" - name: Store benchmark results diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 532c3826756..a46c984f7fd 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -88,6 +88,7 @@ jobs: if: ${{ env.shouldPerformBackendBuild == 'true' }} with: jvm: temurin:1.11.0.17 + - uses: sbt/setup-sbt@v1 - name: Cache ivy packages if: ${{ env.shouldPerformBackendBuild == 'true' }} uses: actions/cache@v3 @@ -191,6 +192,7 @@ jobs: - name: Untar artifacts shell: bash run: tar xfz target.tgz + - uses: sbt/setup-sbt@v1 - name: Cache ivy packages uses: actions/cache@v3 with: @@ -230,6 +232,7 @@ jobs: - uses: coursier/setup-action@v1 with: jvm: temurin:1.11.0.17 + - uses: sbt/setup-sbt@v1 - name: Cache ivy packages uses: actions/cache@v3 with: @@ -245,6 +248,7 @@ jobs: - name: Untar artifacts shell: bash run: tar xfz target.tgz + - uses: sbt/setup-sbt@v1 - name: Integration tests shell: bash env: @@ -277,6 +281,7 @@ jobs: - uses: coursier/setup-action@v1 with: jvm: temurin:1.11.0.17 + - uses: sbt/setup-sbt@v1 - name: Cache ivy packages uses: actions/cache@v3 with: @@ -541,6 +546,7 @@ jobs: - uses: coursier/setup-action@v1 with: jvm: temurin:1.11.0.17 + - uses: sbt/setup-sbt@v1 - name: Cache ivy packages uses: actions/cache@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59c43018a67..6a69569d24c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -58,6 +58,8 @@ jobs: with: node-version: ${{ steps.nvm.outputs.NODE_VERSION }} + - uses: sbt/setup-sbt@v1 + - name: Cache ivy packages uses: actions/cache@v3 with: