From 8e0b50dea77e1bcc3879211069c79eee74030a18 Mon Sep 17 00:00:00 2001 From: Fausto Di Natale Date: Wed, 6 Oct 2021 14:46:02 +0000 Subject: [PATCH 1/2] Update scala-library to 2.12.15 --- .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 40dd53be..e1dc440b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.5, 2.12.10] + scala: [2.13.5, 2.12.15] java: [adopt@1.8, adopt@1.11] runs-on: ${{ matrix.os }} steps: @@ -64,21 +64,21 @@ jobs: - name: Stop docker containers run: docker-compose down - - if: matrix.scala == '2.12.10' + - if: matrix.scala == '2.12.15' uses: ruby/setup-ruby@v1 with: ruby-version: 2.6 - - if: matrix.scala == '2.12.10' + - if: matrix.scala == '2.12.15' run: gem update --system - - if: matrix.scala == '2.12.10' + - if: matrix.scala == '2.12.15' run: gem install sass - - if: matrix.scala == '2.12.10' + - if: matrix.scala == '2.12.15' run: gem install jekyll -v 4 - - if: matrix.scala == '2.12.10' + - if: matrix.scala == '2.12.15' run: sbt ++${{ matrix.scala }} site/makeMicrosite - name: Compress target directories @@ -153,7 +153,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.5, 2.12.10] + scala: [2.13.5, 2.12.15] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 9655853f..9e32c8e4 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ val Scala213 = "2.13.5" -val Scala212 = "2.12.10" +val Scala212 = "2.12.15" val Java18 = "adopt@1.8" val Java11 = "adopt@1.11" From b60d70cf8288533012e657e23b8ae522d59e3e6b Mon Sep 17 00:00:00 2001 From: Fausto Di Natale Date: Wed, 6 Oct 2021 14:46:23 +0000 Subject: [PATCH 2/2] Regenerate workflow with sbt-github-actions --- .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 e1dc440b..5aa2dbcb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -133,12 +133,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.10) + - name: Download target directories (2.12.15) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.10-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} - - name: Inflate target directories (2.12.10) + - name: Inflate target directories (2.12.15) run: | tar xf targets.tar rm targets.tar @@ -215,12 +215,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.10) + - name: Download target directories (2.12.15) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.10-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} - - name: Inflate target directories (2.12.10) + - name: Inflate target directories (2.12.15) run: | tar xf targets.tar rm targets.tar