From 7aa807e60e2b395130bfbd968eba256eab657b56 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Tue, 11 Jan 2022 01:39:02 -0500 Subject: [PATCH] Run sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 16 ++++++++-------- .mergify.yml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8294e92..15678c2 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: @@ -77,7 +77,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.7] + scala: [3.0.2] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -109,22 +109,22 @@ jobs: with: node-version: 12 - - 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