From 58a4446285feae65bab4c5af4c1bb1f06a2e72a1 Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 4 Apr 2023 07:25:01 -0700 Subject: [PATCH 1/2] Update Deps --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index ea467364..df6821c9 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")) val Scala213 = "2.13.8" -ThisBuild / crossScalaVersions := Seq("2.12.15", "3.0.1", Scala213) +ThisBuild / crossScalaVersions := Seq("2.12.15", "3.2.2", Scala213) ThisBuild / scalaVersion := crossScalaVersions.value.last lazy val `epimetheus` = tlCrossRootProject @@ -32,9 +32,9 @@ lazy val site = project.in(file("site")) .dependsOn(core) -val prometheusV = "0.15.0" -val catsV = "2.7.0" -val catsEffectV = "3.3.12" +val prometheusV = "0.16.0" +val catsV = "2.9.0" +val catsEffectV = "3.4.8" val shapelessV = "2.3.9" val munitCatsEffectV = "1.0.7" From 68336a76cbb71a1fcaaa67235d28ea791e1ced8b Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 4 Apr 2023 07:29:53 -0700 Subject: [PATCH 2/2] Update Plugins and gha --- .github/workflows/ci.yml | 62 ++++++++++++++++++++-------------------- project/plugins.sbt | 4 +-- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f02aae60..5caea72f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,9 @@ name: Continuous Integration on: pull_request: - branches: ['**'] + branches: ['**', '!update/**', '!pr/**'] push: - branches: ['**'] + branches: ['**', '!update/**', '!pr/**'] tags: [v*] env: @@ -28,34 +28,34 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 3.0.1, 2.13.8] + scala: [2.12.15, 3.2.2, 2.13.8] java: [temurin@17] project: [rootJVM] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Download Java (temurin@17) id: download-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v1 + 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@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt @@ -67,18 +67,18 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Check that workflows are up to date - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' 'project /' githubWorkflowCheck + run: sbt githubWorkflowCheck - name: Test - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' test + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@17' - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' mimaReportBinaryIssues + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@17' - run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' doc + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v')) @@ -90,7 +90,7 @@ jobs: - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v')) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar @@ -107,28 +107,28 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Download Java (temurin@17) id: download-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v1 + 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@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt @@ -140,7 +140,7 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Download target directories (2.12.15, rootJVM) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.15-rootJVM @@ -149,18 +149,18 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (3.0.1, rootJVM) - uses: actions/download-artifact@v2 + - name: Download target directories (3.2.2, rootJVM) + uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.1-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2-rootJVM - - name: Inflate target directories (3.0.1, rootJVM) + - name: Inflate target directories (3.2.2, rootJVM) run: | tar xf targets.tar rm targets.tar - name: Download target directories (2.13.8, rootJVM) - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8-rootJVM @@ -181,7 +181,7 @@ 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 }}' tlRelease + run: sbt '++ ${{ matrix.scala }}' tlCiRelease site: name: Generate Site @@ -193,28 +193,28 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Download Java (temurin@17) id: download-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v1 + 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@v2 + uses: actions/setup-java@v3 with: distribution: jdkfile java-version: 17 jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} - name: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt @@ -226,11 +226,11 @@ jobs: key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Generate site - run: sbt '++${{ matrix.scala }}' site/tlSite + run: sbt '++ ${{ matrix.scala }}' site/tlSite - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' - uses: peaceiris/actions-gh-pages@v3.8.0 + uses: peaceiris/actions-gh-pages@v3.9.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: site/target/docs/site diff --git a/project/plugins.sbt b/project/plugins.sbt index 8ee00b7c..896a016a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ // addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20") -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.9") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.9") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.19") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.19")