diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd51e83..643fa9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.7] + scala: [2.13.7, 3.0.2] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -58,7 +58,7 @@ jobs: run: sbt ++${{ matrix.scala }} test - name: Compress target directories - run: tar cf targets.tar bootstrap3_scalatags/target fomanticui_scalatags/target bootstrap4_scalatags/target bulma_scalatags/target bootstrap3_scalajsreact/target fontawesome_scalatags/target target bulma_scalajsreact/target bootstrap4_scalajsreact/target fontawesome_scalajsreact/target semanticui_scalajsreact/target semanticui_scalatags/target fomanticui_scalajsreact/target project/target + run: tar cf targets.tar bootstrap3_scalatags/target fomanticui_scalatags/target bootstrap4_scalatags/target bulma_scalatags/target bootstrap3_scalajsreact/target fontawesome_scalatags/target bootstrap5_scalajsreact/target target bulma_scalajsreact/target bootstrap4_scalajsreact/target fontawesome_scalajsreact/target semanticui_scalajsreact/target semanticui_scalatags/target fomanticui_scalajsreact/target bootstrap5_scalatags/target project/target - name: Upload target directories uses: actions/upload-artifact@v2 @@ -73,7 +73,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7] + scala: [3.0.2] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -101,22 +101,22 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.12.15) + - name: Download target directories (2.13.7) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} - - name: Inflate target directories (2.12.15) + - name: Inflate target directories (2.13.7) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.7) + - name: Download target directories (3.0.2) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} + name: target-${{ matrix.os }}-3.0.2-${{ matrix.java }} - - name: Inflate target directories (2.13.7) + - name: Inflate target directories (3.0.2) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index d380ab6..d59f50e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,8 +6,8 @@ pull_request_rules: - name: Automatically merge successful scala-steward PRs conditions: - author=scala-steward - - check-success=Build and Test (ubuntu-latest, 2.12.15, temurin@11) - check-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11) + - check-success=Build and Test (ubuntu-latest, 3.0.2, temurin@11) actions: queue: name: default