From b55a66dd84369660bdf34dc842a621466d524930 Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 08:01:39 +0000 Subject: [PATCH 1/4] Update sbt-http4s-org to 0.15.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e49bb86c..384029ff 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1" libraryDependencies += "org.http4s" %% "http4s-dsl" % http4sVersion libraryDependencies += "org.http4s" %% "http4s-ember-server" % http4sVersion -addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.13") +addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.15.0") addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.3") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") From 7298a83c7d93c17da5401f579f106955e1f8492f Mon Sep 17 00:00:00 2001 From: "http4s-steward[bot]" <106843772+http4s-steward[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 08:02:48 +0000 Subject: [PATCH 2/4] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 165 +++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 83 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 759a9a0a..41a1d623 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,13 +15,13 @@ on: tags: [v*] env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +concurrency: + group: ${{ github.workflow }} @ ${{ github.ref }} + cancel-in-progress: true + jobs: build: name: Build and Test @@ -29,43 +29,29 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.12.18, 2.13.11, 3.3.0] + scala: [2.12, 2.13, 3] java: [temurin@17] project: [rootNodeJS, rootChrome, rootFirefox] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) 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@v2 - with: - distribution: temurin - java-version: 17 - - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update - name: Setup Node.js if: matrix.project == 'rootNodeJS' @@ -77,18 +63,18 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' && matrix.project == 'rootNodeJS' run: sbt '++ ${{ matrix.scala }}' 'project ${{ matrix.project }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: Test run: sbt '++ ${{ matrix.scala }}' 'project ${{ matrix.project }}' test - name: Check binary compatibility - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' && matrix.project == 'rootNodeJS' run: sbt '++ ${{ matrix.scala }}' 'project ${{ matrix.project }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest' && matrix.project == 'rootNodeJS' run: sbt '++ ${{ matrix.scala }}' 'project ${{ matrix.project }}' doc - name: Monitor artifact size @@ -96,7 +82,7 @@ jobs: run: sbt '++ ${{ matrix.scala }}' 'project ${{ matrix.project }}' artifactSizeTest/bundleMon - name: Check scalafix lints - if: matrix.java == 'temurin@17' && !startsWith(matrix.scala, '3.') + if: matrix.java == 'temurin@17' && !startsWith(matrix.scala, '3') run: sbt '++ ${{ matrix.scala }}' 'project ${{ matrix.project }}' 'scalafixAll --check' - name: Check unused compile dependencies @@ -105,11 +91,11 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.2') - run: mkdir -p testsChrome/target .rootNodeJS/target target site/target dom/target artifact-size-test/target jsdocs/target .rootChrome/target .rootFirefox/target testsFirefox/target testsNodeJS/target project/target + run: mkdir -p dom/target jsdocs/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.2') - run: tar cf targets.tar testsChrome/target .rootNodeJS/target target site/target dom/target artifact-size-test/target jsdocs/target .rootChrome/target .rootFirefox/target testsFirefox/target testsNodeJS/target project/target + run: tar cf targets.tar dom/target jsdocs/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.2') @@ -133,80 +119,76 @@ jobs: with: fetch-depth: 0 - - 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) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - - name: Download target directories (2.12.18, rootNodeJS) + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update + + - name: Download target directories (2.12, rootNodeJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootNodeJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNodeJS - - name: Inflate target directories (2.12.18, rootNodeJS) + - name: Inflate target directories (2.12, rootNodeJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.11, rootNodeJS) + - name: Download target directories (2.13, rootNodeJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootNodeJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNodeJS - - name: Inflate target directories (2.13.11, rootNodeJS) + - name: Inflate target directories (2.13, rootNodeJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.0, rootNodeJS) + - name: Download target directories (3, rootNodeJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootNodeJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNodeJS - - name: Inflate target directories (3.3.0, rootNodeJS) + - name: Inflate target directories (3, rootNodeJS) run: | tar xf targets.tar rm targets.tar - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} run: echo $PGP_SECRET | base64 -di | gpg --import - name: Import signing key and strip passphrase if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != '' + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} run: | echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg (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 + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} run: sbt tlCiRelease - site: - name: Generate Site + dependency-submission: + name: Submit Dependencies + if: github.event_name != 'pull_request' strategy: matrix: os: [ubuntu-latest] @@ -218,40 +200,57 @@ jobs: with: fetch-depth: 0 - - name: Download Java (temurin@17) - id: download-java-temurin-17 + - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: typelevel/download-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: 17 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update + + - name: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + modules-ignore: testschrome_sjs1_2.12 testschrome_sjs1_2.13 testschrome_sjs1_3 rootnodejs_2.12 rootnodejs_2.13 rootnodejs_3 http4s-dom_2.12 http4s-dom_2.13 http4s-dom_3 docs_2.12 docs_2.13 docs_3 artifactsizetest_sjs1_2.12 artifactsizetest_sjs1_2.13 artifactsizetest_sjs1_3 rootchrome_2.12 rootchrome_2.13 rootchrome_3 sbt-http4s-org-scalafix-internal_2.12 sbt-http4s-org-scalafix-internal_2.13 sbt-http4s-org-scalafix-internal_3 rootfirefox_2.12 rootfirefox_2.13 rootfirefox_3 testsfirefox_sjs1_2.12 testsfirefox_sjs1_2.13 testsfirefox_sjs1_3 testsnodejs_sjs1_2.12 testsnodejs_sjs1_2.13 testsnodejs_sjs1_3 + configs-ignore: test scala-tool scala-doc-tool test-internal + + site: + name: Generate Site + strategy: + matrix: + os: [ubuntu-latest] + java: [temurin@17] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Setup Java (temurin@17) + id: setup-java-temurin-17 if: matrix.java == 'temurin@17' uses: actions/setup-java@v3 with: - distribution: jdkfile + distribution: temurin java-version: 17 - jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} + cache: sbt - - name: Cache sbt - uses: actions/cache@v3 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: sbt +update - name: Generate site run: sbt docs/tlSite - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/series/0.2' - uses: peaceiris/actions-gh-pages@v3.9.0 + uses: peaceiris/actions-gh-pages@v3.9.3 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: site/target/docs/site From ffe4a01908f24e5f57ae3dec40c802cbacadeef9 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 23 Aug 2023 08:12:30 +0000 Subject: [PATCH 3/4] Fix warning --- build.sbt | 9 +++------ .../src/test/scala/org/http4s/dom/NodeJSFetchSuite.scala | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index ed1b147e..d3fd7fe4 100644 --- a/build.sbt +++ b/build.sbt @@ -251,7 +251,7 @@ lazy val jsdocs = project .dependsOn(dom) .settings( - tlFatalWarningsInCi := false, + tlFatalWarnings := false, libraryDependencies ++= Seq( "org.http4s" %%% "http4s-circe" % http4sVersion, "io.circe" %%% "circe-generic" % circeVersion @@ -264,11 +264,8 @@ lazy val docs = project .settings( tlSiteApiModule := Some((dom / projectID).value), tlSiteApiPackage := Some("org.http4s.dom"), - tlFatalWarningsInCi := false, + tlFatalWarnings := false, mdocJS := Some(jsdocs), - tlSiteRelatedProjects := Seq( - "calico" -> url("https://armanbilge.github.io/calico/") - ), mdocVariables ++= Map( "HTTP4S_VERSION" -> http4sVersion, "CIRCE_VERSION" -> circeVersion @@ -289,7 +286,7 @@ lazy val docs = project ) ))) }, - tlSiteHeliumConfig ~= { + tlSiteHelium ~= { // Actually, this *disables* auto-linking, to avoid duplicates with mdoc _.site.autoLinkJS() } diff --git a/testsNodeJS/src/test/scala/org/http4s/dom/NodeJSFetchSuite.scala b/testsNodeJS/src/test/scala/org/http4s/dom/NodeJSFetchSuite.scala index e095df62..d8b59184 100644 --- a/testsNodeJS/src/test/scala/org/http4s/dom/NodeJSFetchSuite.scala +++ b/testsNodeJS/src/test/scala/org/http4s/dom/NodeJSFetchSuite.scala @@ -43,6 +43,7 @@ class NodeJSFetchSuite extends ClientRouteTestBattery("FetchClient") { val address = server().addresses.head client() .expect[String](s"http://$address/delayed") + .void .timeoutTo(100.millis, IO.unit) .timed .flatMap { From e22b4a808b6801a7d74188834391075db24adca8 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 23 Aug 2023 01:43:19 -0700 Subject: [PATCH 4/4] Fix other warning --- .../src/test/scala/org/http4s/dom/FetchServiceWorkerSuite.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/testsBrowser/src/test/scala/org/http4s/dom/FetchServiceWorkerSuite.scala b/testsBrowser/src/test/scala/org/http4s/dom/FetchServiceWorkerSuite.scala index 3057edcd..b6e0d483 100644 --- a/testsBrowser/src/test/scala/org/http4s/dom/FetchServiceWorkerSuite.scala +++ b/testsBrowser/src/test/scala/org/http4s/dom/FetchServiceWorkerSuite.scala @@ -113,6 +113,7 @@ class FetchServiceWorkerSuite extends CatsEffectSuite { test("Cancel an in-flight request") { client .expect[String](GET(baseUrl / "delayed")) + .void .timeoutTo(100.millis, IO.unit) .timed .flatMap {