From b43372896bdd29db9b8dec2ed0d71d3dfbf484a8 Mon Sep 17 00:00:00 2001 From: Hossein Naderi Date: Tue, 14 Nov 2023 15:47:47 +0330 Subject: [PATCH] Fixed broken build after sbt-typelevel update --- .github/workflows/ci.yml | 144 +++++++++++++++++++++++---------------- build.sbt | 22 +++--- ci.sbt | 1 + flake.nix | 2 +- project/SiteConfig.scala | 1 - 5 files changed, 98 insertions(+), 72 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81640619..488d507e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,20 +15,20 @@ 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 strategy: matrix: os: [ubuntu-latest] - scala: [3.3.0] + scala: [3] java: [temurin@8, temurin@17] project: [rootJS, rootJVM, rootNative] exclude: @@ -37,23 +37,20 @@ jobs: - project: rootNative java: temurin@17 runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - 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@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: 'nix develop .#${{ matrix.java }} -c sbt +update' + + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: 'nix develop .#${{ matrix.java }} -c sbt +update' - name: Install Nix uses: cachix/install-nix-action@v17 @@ -89,11 +86,11 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: mkdir -p modules/skunk-upickle/.native/target modules/backend/.native/target modules/munit/.js/target modules/skunk-upickle/.js/target target modules/skunk-circe/.jvm/target modules/postgres/.js/target modules/skunk/.native/target unidocs/target .js/target modules/skunk-circe/.native/target modules/core/.native/target site/target modules/backend/.jvm/target modules/skunk/.jvm/target modules/skunk-jsoniter/.native/target modules/skunk-jsoniter/.jvm/target modules/postgres/.jvm/target modules/core/.js/target examples/.js/target modules/skunk-circe/.js/target modules/doobie/.jvm/target modules/postgres/.native/target modules/doobie-circe/.jvm/target modules/core/.jvm/target .jvm/target .native/target modules/doobie-jsoniter/.jvm/target examples/.jvm/target modules/backend-tests/js/target modules/backend-tests/jvm/target modules/skunk-jsoniter/.js/target modules/doobie-upickle/.jvm/target modules/skunk-upickle/.jvm/target modules/skunk/.js/target modules/munit/.jvm/target modules/backend-tests/native/target mdoc-plantuml/target modules/backend/.js/target modules/munit/.native/target project/target + run: mkdir -p modules/skunk-upickle/.native/target modules/backend/.native/target modules/munit/.js/target modules/skunk-upickle/.js/target modules/skunk-circe/.jvm/target modules/postgres/.js/target modules/skunk/.native/target unidocs/target modules/skunk-circe/.native/target modules/core/.native/target modules/backend/.jvm/target modules/skunk/.jvm/target modules/skunk-jsoniter/.native/target modules/skunk-jsoniter/.jvm/target modules/postgres/.jvm/target modules/core/.js/target modules/skunk-circe/.js/target modules/doobie/.jvm/target modules/postgres/.native/target modules/doobie-circe/.jvm/target modules/core/.jvm/target modules/doobie-jsoniter/.jvm/target modules/skunk-jsoniter/.js/target modules/doobie-upickle/.jvm/target modules/skunk-upickle/.jvm/target modules/skunk/.js/target modules/munit/.jvm/target modules/backend/.js/target modules/munit/.native/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - run: tar cf targets.tar modules/skunk-upickle/.native/target modules/backend/.native/target modules/munit/.js/target modules/skunk-upickle/.js/target target modules/skunk-circe/.jvm/target modules/postgres/.js/target modules/skunk/.native/target unidocs/target .js/target modules/skunk-circe/.native/target modules/core/.native/target site/target modules/backend/.jvm/target modules/skunk/.jvm/target modules/skunk-jsoniter/.native/target modules/skunk-jsoniter/.jvm/target modules/postgres/.jvm/target modules/core/.js/target examples/.js/target modules/skunk-circe/.js/target modules/doobie/.jvm/target modules/postgres/.native/target modules/doobie-circe/.jvm/target modules/core/.jvm/target .jvm/target .native/target modules/doobie-jsoniter/.jvm/target examples/.jvm/target modules/backend-tests/js/target modules/backend-tests/jvm/target modules/skunk-jsoniter/.js/target modules/doobie-upickle/.jvm/target modules/skunk-upickle/.jvm/target modules/skunk/.js/target modules/munit/.jvm/target modules/backend-tests/native/target mdoc-plantuml/target modules/backend/.js/target modules/munit/.native/target project/target + run: tar cf targets.tar modules/skunk-upickle/.native/target modules/backend/.native/target modules/munit/.js/target modules/skunk-upickle/.js/target modules/skunk-circe/.jvm/target modules/postgres/.js/target modules/skunk/.native/target unidocs/target modules/skunk-circe/.native/target modules/core/.native/target modules/backend/.jvm/target modules/skunk/.jvm/target modules/skunk-jsoniter/.native/target modules/skunk-jsoniter/.jvm/target modules/postgres/.jvm/target modules/core/.js/target modules/skunk-circe/.js/target modules/doobie/.jvm/target modules/postgres/.native/target modules/doobie-circe/.jvm/target modules/core/.jvm/target modules/doobie-jsoniter/.jvm/target modules/skunk-jsoniter/.js/target modules/doobie-upickle/.jvm/target modules/skunk-upickle/.jvm/target modules/skunk/.js/target modules/munit/.jvm/target modules/backend/.js/target modules/munit/.native/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') @@ -113,69 +110,106 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - 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@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: 'nix develop .#${{ matrix.java }} -c sbt +update' + + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: 'nix develop .#${{ matrix.java }} -c sbt +update' - name: Install Nix uses: cachix/install-nix-action@v17 - - name: Download target directories (3.3.0, rootJS) + - name: Download target directories (3, rootJS) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS - - name: Inflate target directories (3.3.0, rootJS) + - name: Inflate target directories (3, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.0, rootJVM) + - name: Download target directories (3, rootJVM) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM - - name: Inflate target directories (3.3.0, rootJVM) + - name: Inflate target directories (3, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.0, rootNative) + - name: Download target directories (3, rootNative) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative - - name: Inflate target directories (3.3.0, rootNative) + - name: Inflate target directories (3, rootNative) run: | tar xf targets.tar rm targets.tar - name: Import signing key if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' - run: echo $PGP_SECRET | base64 -di | gpg --import + env: + PGP_SECRET: ${{ secrets.PGP_SECRET }} + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + run: echo $PGP_SECRET | base64 -d -i - | 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_SECRET" | base64 -d -i - > /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: 'nix develop .#${{ matrix.java }} -c sbt tlCiRelease' + dependency-submission: + name: Submit Dependencies + if: github.event_name != 'pull_request' + strategy: + matrix: + os: [ubuntu-latest] + java: [temurin@8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: 'nix develop .#${{ matrix.java }} -c sbt +update' + + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: 'nix develop .#${{ matrix.java }} -c sbt +update' + + - name: Install Nix + uses: cachix/install-nix-action@v17 + + - name: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + modules-ignore: edomata_3 docs_3 examples_sjs1_3 edomata_3 edomata_3 examples_3 edomata-backend-tests_sjs1_3 edomata-backend-tests_3 edomata-backend-tests_native0.4_3 mdocplantuml_3 + configs-ignore: test scala-tool scala-doc-tool test-internal + post-build: name: post build needs: [build] @@ -192,25 +226,21 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [temurin@8] + java: [temurin@17] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - 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@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: 'nix develop .#${{ matrix.java }} -c sbt +update' + + - name: sbt update + if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' + run: 'nix develop .#${{ matrix.java }} -c sbt +update' - name: Install Nix uses: cachix/install-nix-action@v17 @@ -220,7 +250,7 @@ jobs: - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' - 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 diff --git a/build.sbt b/build.sbt index da9ccc90..1fdd4d53 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,6 @@ +import laika.config.ApiLinks +import laika.config.LinkConfig import Dependencies._ -import laika.io.config.SiteConfig -import laika.rewrite.link.ApiLinks -import laika.rewrite.link.LinkConfig import sbt.ThisBuild import sbtcrossproject.CrossProject @@ -82,7 +81,7 @@ lazy val docs = project .in(file("site")) .enablePlugins(TypelevelSitePlugin) .settings( - tlSiteHeliumConfig := SiteConfigs(mdocVariables.value), + tlSiteHelium := SiteConfigs(mdocVariables.value), tlSiteRelatedProjects := Seq( TypelevelProject.Cats, TypelevelProject.CatsEffect, @@ -91,15 +90,12 @@ lazy val docs = project ), laikaConfig := LaikaConfig.defaults .withConfigValue( - LinkConfig(apiLinks = - Seq( - ApiLinks( - tlSiteApiUrl.value - .map(_.toString()) - .getOrElse("/edomata/api/"), - "edomata" - ) - ) + LinkConfig.empty.addApiLinks( + ApiLinks( + tlSiteApiUrl.value + .map(_.toString()) + .getOrElse("/edomata/api/") + ).withPackagePrefix("edomata") ) ), laikaIncludeAPI := true diff --git a/ci.sbt b/ci.sbt index 52420054..c7676c3b 100644 --- a/ci.sbt +++ b/ci.sbt @@ -3,6 +3,7 @@ val LTSJava = JavaSpec.temurin("17") inThisBuild( List( + tlSiteJavaVersion := LTSJava, githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava), githubWorkflowBuildPreamble ++= dockerComposeUp, githubWorkflowJobSetup ~= { diff --git a/flake.nix b/flake.nix index 245b9fe8..4cd51f47 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,7 @@ }; }; in { - devShell = mkShell pkgs.jdk8; + devShell = mkShell pkgs.jdk17; devShells = { "temurin@8" = mkShell pkgs.temurin-bin-8; diff --git a/project/SiteConfig.scala b/project/SiteConfig.scala index d307d28e..bd3e0cc8 100644 --- a/project/SiteConfig.scala +++ b/project/SiteConfig.scala @@ -1,6 +1,5 @@ import laika.ast.Path.Root import laika.ast._ -import laika.config.ConfigBuilder import laika.config.LaikaKeys import laika.helium.Helium import laika.helium.config._