From 1b2cde031efd1a97498062ea80f737aed9e47c2c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 6 Sep 2024 14:38:51 +0000 Subject: [PATCH 1/2] Update scala-library to 2.12.20 --- .github/workflows/ci.yml | 14 +++++++------- build.sbt | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adf68618..24777187 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10, 2.12.18] + scala: [2.13.10, 2.12.20] java: [adopt-hotspot@8, adopt-hotspot@11] runs-on: ${{ matrix.os }} steps: @@ -73,21 +73,21 @@ jobs: - name: Stop docker containers run: docker-compose down - - if: matrix.scala == '2.12.18' + - if: matrix.scala == '2.12.20' uses: ruby/setup-ruby@v1 with: ruby-version: 2.6 - - if: matrix.scala == '2.12.18' + - if: matrix.scala == '2.12.20' run: gem update --system - - if: matrix.scala == '2.12.18' + - if: matrix.scala == '2.12.20' run: gem install sass - - if: matrix.scala == '2.12.18' + - if: matrix.scala == '2.12.20' run: gem install jekyll -v 4 - - if: matrix.scala == '2.12.18' + - if: matrix.scala == '2.12.20' run: sbt ++${{ matrix.scala }} site/makeMicrosite - name: Compress target directories @@ -171,7 +171,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10, 2.12.18] + scala: [2.13.10, 2.12.20] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 67672943..7361f30e 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ import sbtghactions.JavaSpec.Distribution.Adopt val Scala213 = "2.13.10" -val Scala212 = "2.12.18" +val Scala212 = "2.12.20" val Java18 = JavaSpec(Adopt, "8") val Java11 = JavaSpec(Adopt, "11") From e04143d46eb26418f6a9a87b93de186bda01d2aa Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 6 Sep 2024 14:39:18 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24777187..c4bdf3c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,12 +151,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.18) + - name: Download target directories (2.12.20) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.20-${{ matrix.java }} - - name: Inflate target directories (2.12.18) + - name: Inflate target directories (2.12.20) run: | tar xf targets.tar rm targets.tar @@ -242,12 +242,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.18) + - name: Download target directories (2.12.20) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.20-${{ matrix.java }} - - name: Inflate target directories (2.12.18) + - name: Inflate target directories (2.12.20) run: | tar xf targets.tar rm targets.tar