From 600c17c4038422c9449678ccb5a00724bb94c4fc Mon Sep 17 00:00:00 2001 From: Tyler Clark Date: Fri, 2 Aug 2024 14:24:03 -0500 Subject: [PATCH 1/4] upgrade dependency versions --- build.sbt | 22 +++++++++++----------- project/plugins.sbt | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.sbt b/build.sbt index 9bc5853..f1f635e 100644 --- a/build.sbt +++ b/build.sbt @@ -10,21 +10,21 @@ ThisBuild / tlCiReleaseBranches := Seq("main") ThisBuild / tlSonatypeUseLegacyHost := true -val Scala213 = "2.13.11" +val Scala213 = "2.13.14" -ThisBuild / crossScalaVersions := Seq("2.12.18", Scala213, "3.3.0") +ThisBuild / crossScalaVersions := Seq("2.12.19", Scala213, "3.4.2") ThisBuild / scalaVersion := Scala213 ThisBuild / testFrameworks += new TestFramework("munit.Framework") -val catsV = "2.9.0" -val catsEffectV = "3.5.0" -val fs2V = "3.7.0" -val http4sV = "0.23.19" -val circeV = "0.14.5" -val natchezV = "0.3.2" -val rediculousV = "0.5.0" -val munitCatsEffectV = "1.0.7" +val catsV = "2.11.0" +val catsEffectV = "3.5.4" +val fs2V = "3.10.2" +val http4sV = "0.23.27" +val circeV = "0.14.9" +val natchezV = "0.3.5" +val rediculousV = "0.6.0-M1" +val munitCatsEffectV = "2.0.0-M4" val slf4jV = "1.7.36" @@ -49,7 +49,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform) "io.chrisdavenport" %%% "rediculous" % rediculousV, "org.tpolecat" %%% "natchez-core" % natchezV, - "org.typelevel" %%% "munit-cats-effect-3" % munitCatsEffectV % Test, + "org.typelevel" %%% "munit-cats-effect" % munitCatsEffectV % Test, ) ).jsSettings( diff --git a/project/plugins.sbt b/project/plugins.sbt index 44aca73..8fc902c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.22") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.22") -addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.4.22") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") +addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.7.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.7.2") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1") From ced75157dbb1f54ac32467dca71de3314580720a Mon Sep 17 00:00:00 2001 From: Tyler Clark Date: Fri, 2 Aug 2024 14:25:07 -0500 Subject: [PATCH 2/4] run githubWorkflowGenerate --- .github/workflows/ci.yml | 234 ++++++++++++++++++++++----------------- 1 file changed, 131 insertions(+), 103 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f868768..681f571 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,62 +15,52 @@ 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: [2.12.18, 2.13.11, 3.3.0] + scala: [2.12, 2.13, 3] java: [temurin@8] - project: [rootJS, rootJVM] + project: [natchez-rediculousJVM, natchez-rediculousJS] runs-on: ${{ matrix.os }} + timeout-minutes: 60 steps: + - name: Install sbt + if: contains(runner.os, 'macos') + run: brew install sbt + - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 - if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 - with: - distribution: temurin - java-version: 8 - - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.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@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - name: Check that workflows are up to date run: sbt githubWorkflowCheck - name: scalaJSLink - if: matrix.project == 'rootJS' + if: matrix.project == 'natchez-rediculousJS' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult - name: Test @@ -86,15 +76,15 @@ 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 examples/target target .js/target site/target core/.js/target core/.jvm/target .jvm/target .native/target project/target + run: mkdir -p core/.js/target core/.jvm/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 examples/target target .js/target site/target core/.js/target core/.jvm/target .jvm/target .native/target project/target + run: tar cf targets.tar core/.js/target core/.jvm/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar @@ -109,160 +99,198 @@ jobs: java: [temurin@8] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + if: contains(runner.os, 'macos') + run: brew install sbt + - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 + cache: sbt - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 - with: - distribution: jdkfile - java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - - 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, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, natchez-rediculousJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-natchez-rediculousJVM - - name: Inflate target directories (2.12.18, rootJS) + - name: Inflate target directories (2.12, natchez-rediculousJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.18, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, natchez-rediculousJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.18-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-natchez-rediculousJS - - name: Inflate target directories (2.12.18, rootJVM) + - name: Inflate target directories (2.12, natchez-rediculousJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.11, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, natchez-rediculousJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-natchez-rediculousJVM - - name: Inflate target directories (2.13.11, rootJS) + - name: Inflate target directories (2.13, natchez-rediculousJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.11, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, natchez-rediculousJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-natchez-rediculousJS - - name: Inflate target directories (2.13.11, rootJVM) + - name: Inflate target directories (2.13, natchez-rediculousJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.0, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (3, natchez-rediculousJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3-natchez-rediculousJVM - - name: Inflate target directories (3.3.0, rootJS) + - name: Inflate target directories (3, natchez-rediculousJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.0, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (3, natchez-rediculousJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3-natchez-rediculousJS - - name: Inflate target directories (3.3.0, rootJVM) + - name: Inflate target directories (3, natchez-rediculousJS) 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: sbt tlCiRelease - site: - name: Generate Site + 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: Install sbt + if: contains(runner.os, 'macos') + run: brew install sbt + - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Download Java (temurin@8) - id: download-java-temurin-8 + - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: typelevel/download-java@v2 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update + + - name: Submit Dependencies + uses: scalacenter/sbt-dependency-submission@v2 + with: + modules-ignore: examples_2.12 examples_2.13 examples_3 site_2.12 site_2.13 site_3 natchez-rediculousnative_2.12 natchez-rediculousnative_2.13 natchez-rediculousnative_3 natchez-rediculousjvm_2.12 natchez-rediculousjvm_2.13 natchez-rediculousjvm_3 natchez-rediculousjs_2.12 natchez-rediculousjs_2.13 natchez-rediculousjs_3 + configs-ignore: test scala-tool scala-doc-tool test-internal + + site: + name: Generate Site + strategy: + matrix: + os: [ubuntu-latest] + java: [temurin@11] + runs-on: ${{ matrix.os }} + steps: + - name: Install sbt + if: contains(runner.os, 'macos') + run: brew install sbt + + - name: Checkout current branch (full) + uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Setup Java (temurin@8) + id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: jdkfile + distribution: temurin java-version: 8 - jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' + run: sbt +update - - name: Cache sbt - uses: actions/cache@v3 + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v4 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') }} + distribution: temurin + java-version: 11 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update - name: Generate site run: sbt site/tlSite - 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@v4.0.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: site/target/docs/site From e859a2fd5b280a0a12e6f46e697d4b9e3e99eaa5 Mon Sep 17 00:00:00 2001 From: Tyler Clark Date: Fri, 2 Aug 2024 14:25:33 -0500 Subject: [PATCH 3/4] increase tlBaseVersion --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f1f635e..27b5478 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / tlBaseVersion := "0.1" // your current series x.y +ThisBuild / tlBaseVersion := "0.2" // your current series x.y ThisBuild / organization := "io.chrisdavenport" ThisBuild / organizationName := "Christopher Davenport" From 37351d4b87f0eb0042e3454f811c00b0eb731d0e Mon Sep 17 00:00:00 2001 From: Tyler Clark Date: Wed, 14 Aug 2024 16:54:13 -0500 Subject: [PATCH 4/4] rename index.md -> README.md --- docs/{index.md => README.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/{index.md => README.md} (100%) diff --git a/docs/index.md b/docs/README.md similarity index 100% rename from docs/index.md rename to docs/README.md