diff options
| author | Jack | 2022-01-12 04:27:19 +0000 |
|---|---|---|
| committer | Jack | 2022-01-12 04:27:19 +0000 |
| commit | 29df513e348cc809876893f650af8180f0190496 (patch) | |
| tree | 06daaea954b4e5af7113f06e4bdbb78b33515cb3 /.github | |
| parent | 5242ce90659decb9058ee75db56e5c188029fbf9 (diff) | |
| parent | 747d16311bdf185d2e98e452b14cb5d8ccca004c (diff) | |
Merge branch 'master' into 3.5-release
Diffstat (limited to '.github')
| -rw-r--r-- | .github/configs/mergify_config.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.github/configs/mergify_config.yml b/.github/configs/mergify_config.yml new file mode 100644 index 00000000..dbed4fe8 --- /dev/null +++ b/.github/configs/mergify_config.yml @@ -0,0 +1,7 @@ +# Configuration for generating .mergify.yml +conditions: + - status-success=all tests passed +branches: + - 3.2.x + - 3.3.x + - 3.4.x diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ce18fab0..dc7376a3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,9 +43,12 @@ jobs: java-version: ${{ matrix.jvm }} - name: Cache Scala uses: coursier/cache-action@v5 + - name: Check Formatting (Scala 2.12 only) + if: startsWith(matrix.scala, '2.12') + run: sbt ++${{ matrix.scala }} scalafmtCheckAll - name: Documentation (Scala 2.12 only) if: startsWith(matrix.scala, '2.12') - run: sbt ++${{ matrix.scala }} docs/mdoc + run: sbt ++${{ matrix.scala }} docs/mdoc unidoc - name: Test run: sbt ++${{ matrix.scala }} test - name: Binary compatibility |