diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8ba2ba..8fe9eab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,6 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.17] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -164,36 +163,18 @@ jobs: (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1) - name: Publish - run: sbt '++ ${{ matrix.scala }}' tlCiRelease + run: sbt tlCiRelease validate-steward: name: Validate Steward Config strategy: matrix: os: [ubuntu-latest] - scala: [2.13.6] - java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (fast) uses: actions/checkout@v3 - - name: Download Java (temurin@17) - id: download-java-temurin-17 - if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 17 - - - name: Setup Java (temurin@17) - if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 - with: - distribution: jdkfile - java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - - uses: coursier/setup-action@v1 with: apps: scala-steward @@ -205,7 +186,6 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.17] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -243,7 +223,7 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Generate site - run: sbt '++ ${{ matrix.scala }}' docs/tlSite + run: sbt docs/tlSite - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' diff --git a/project/plugins.sbt b/project/plugins.sbt index 15a9b7a..b4f0ade 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.20") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.20") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.21") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.21")