From 4b2a4c39cd620f915554c2480748d367524089de Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:35:57 +0000 Subject: [PATCH] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 34 +++++++++++++++++----------------- .mergify.yml | 18 +++++++++--------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f23d1aa..7d0a7056 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,24 +24,24 @@ concurrency: jobs: build: - name: Build and Test + name: Test strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] scala: [2.12, 2.13, 3] java: [temurin@8] project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: - - name: Install sbt - uses: sbt/setup-sbt@v1 - - name: Checkout current branch (full) uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' @@ -59,7 +59,7 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: scalaJSLink @@ -74,11 +74,11 @@ jobs: run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc - name: Make target directories @@ -102,18 +102,18 @@ jobs: if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] java: [temurin@8] runs-on: ${{ matrix.os }} steps: - - name: Install sbt - uses: sbt/setup-sbt@v1 - - name: Checkout current branch (full) uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' @@ -246,18 +246,18 @@ jobs: if: github.event.repository.fork == false && github.event_name != 'pull_request' strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] java: [temurin@8] runs-on: ${{ matrix.os }} steps: - - name: Install sbt - uses: sbt/setup-sbt@v1 - - name: Checkout current branch (full) uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' @@ -281,7 +281,7 @@ jobs: name: Make site strategy: matrix: - os: [ubuntu-latest] + os: [ubuntu-22.04] scala: [2.13.16] java: [temurin@11] runs-on: ${{ matrix.os }} diff --git a/.mergify.yml b/.mergify.yml index 9b526705..54fe1747 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -12,15 +12,15 @@ pull_request_rules: - or: - body~=labels:.*early-semver-patch - body~=labels:.*early-semver-minor - - 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.12, temurin@8, rootNative) - - 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, 2.13, temurin@8, rootNative) - - 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, 3, temurin@8, rootNative) + - status-success=Test (ubuntu-22.04, 2.12, temurin@8, rootJS) + - status-success=Test (ubuntu-22.04, 2.12, temurin@8, rootJVM) + - status-success=Test (ubuntu-22.04, 2.12, temurin@8, rootNative) + - status-success=Test (ubuntu-22.04, 2.13, temurin@8, rootJS) + - status-success=Test (ubuntu-22.04, 2.13, temurin@8, rootJVM) + - status-success=Test (ubuntu-22.04, 2.13, temurin@8, rootNative) + - status-success=Test (ubuntu-22.04, 3, temurin@8, rootJS) + - status-success=Test (ubuntu-22.04, 3, temurin@8, rootJVM) + - status-success=Test (ubuntu-22.04, 3, temurin@8, rootNative) actions: merge: {} - name: Label core PRs