diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3236c21..1b212a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12, 2.13, 3] + scala: [2.13.14, 2.13.14, 3.4.2] java: [temurin@8] project: [rootJS, rootJVM] runs-on: ${{ matrix.os }} @@ -128,62 +128,62 @@ jobs: if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' run: sbt +update - - name: Download target directories (2.12, rootJS) + - name: Download target directories (2.13.14, rootJS) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-rootJS - - name: Inflate target directories (2.12, rootJS) + - name: Inflate target directories (2.13.14, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12, rootJVM) + - name: Download target directories (2.13.14, rootJVM) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-rootJVM - - name: Inflate target directories (2.12, rootJVM) + - name: Inflate target directories (2.13.14, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13, rootJS) + - name: Download target directories (2.13.14, rootJS) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-rootJS - - name: Inflate target directories (2.13, rootJS) + - name: Inflate target directories (2.13.14, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13, rootJVM) + - name: Download target directories (2.13.14, rootJVM) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-rootJVM - - name: Inflate target directories (2.13, rootJVM) + - name: Inflate target directories (2.13.14, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3, rootJS) + - name: Download target directories (3.4.2, rootJS) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.4.2-rootJS - - name: Inflate target directories (3, rootJS) + - name: Inflate target directories (3.4.2, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3, rootJVM) + - name: Download target directories (3.4.2, rootJVM) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.4.2-rootJVM - - name: Inflate target directories (3, rootJVM) + - name: Inflate target directories (3.4.2, rootJVM) run: | tar xf targets.tar rm targets.tar @@ -242,7 +242,7 @@ jobs: - name: Submit Dependencies uses: scalacenter/sbt-dependency-submission@v2 with: - modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 readme_2.12 readme_2.13 + modules-ignore: rootjs_2.13 rootjs_2.13 rootjs_3 rootjvm_2.13 rootjvm_2.13 rootjvm_3 rootnative_2.13 rootnative_2.13 rootnative_3 readme_2.13 readme_2.13 configs-ignore: test scala-tool scala-doc-tool test-internal validate-steward: diff --git a/.mergify.yml b/.mergify.yml index 8d53589..801143d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -21,12 +21,12 @@ pull_request_rules: - or: - author=scala-steward - author=scala-steward[bot] - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootJS) - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootJVM) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootJS) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootJVM) - - status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootJS) - - status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootJVM) + - status-success=Build and Test (ubuntu-latest, 2.13.14, temurin@8, rootJS) + - status-success=Build and Test (ubuntu-latest, 2.13.14, temurin@8, rootJVM) + - status-success=Build and Test (ubuntu-latest, 2.13.14, temurin@8, rootJS) + - status-success=Build and Test (ubuntu-latest, 2.13.14, temurin@8, rootJVM) + - status-success=Build and Test (ubuntu-latest, 3.4.2, temurin@8, rootJS) + - status-success=Build and Test (ubuntu-latest, 3.4.2, temurin@8, rootJVM) actions: merge: method: merge