diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8799bb..70938bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,68 +15,58 @@ 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.17, 2.13.10, 3.4.2] + scala: [2.12, 2.13, 3] java: [temurin@8] - project: [rootJS, rootJVM, rootNative] + project: [rediculous-concurrentJVM, rediculous-concurrentNative, rediculous-concurrentJS] 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' - run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult - - name: nativeLink - if: matrix.project == 'rootNative' + if: matrix.project == 'rediculous-concurrentNative' run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink + - name: scalaJSLink + if: matrix.project == 'rediculous-concurrentJS' + run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult + - name: Test run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test @@ -90,15 +80,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 http4s/.jvm/target http4s/.js/target examples/.native/target target .js/target core/native/target site/target core/js/target examples/.js/target core/jvm/target .jvm/target .native/target examples/.jvm/target http4s/.native/target project/target + run: mkdir -p http4s/.jvm/target http4s/.js/target core/native/target core/js/target core/jvm/target http4s/.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 http4s/.jvm/target http4s/.js/target examples/.native/target target .js/target core/native/target site/target core/js/target examples/.js/target core/jvm/target .jvm/target .native/target examples/.jvm/target http4s/.native/target project/target + run: tar cf targets.tar http4s/.jvm/target http4s/.js/target core/native/target core/js/target core/jvm/target http4s/.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') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar @@ -110,195 +100,231 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.4.2] 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.17, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, rediculous-concurrentJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rediculous-concurrentJVM - - name: Inflate target directories (2.12.17, rootJS) + - name: Inflate target directories (2.12, rediculous-concurrentJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.17, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, rediculous-concurrentNative) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rediculous-concurrentNative - - name: Inflate target directories (2.12.17, rootJVM) + - name: Inflate target directories (2.12, rediculous-concurrentNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.17, rootNative) - uses: actions/download-artifact@v3 + - name: Download target directories (2.12, rediculous-concurrentJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rediculous-concurrentJS - - name: Inflate target directories (2.12.17, rootNative) + - name: Inflate target directories (2.12, rediculous-concurrentJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, rediculous-concurrentJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rediculous-concurrentJVM - - name: Inflate target directories (2.13.10, rootJS) + - name: Inflate target directories (2.13, rediculous-concurrentJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, rediculous-concurrentNative) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rediculous-concurrentNative - - name: Inflate target directories (2.13.10, rootJVM) + - name: Inflate target directories (2.13, rediculous-concurrentNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10, rootNative) - uses: actions/download-artifact@v3 + - name: Download target directories (2.13, rediculous-concurrentJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rediculous-concurrentJS - - name: Inflate target directories (2.13.10, rootNative) + - name: Inflate target directories (2.13, rediculous-concurrentJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.4.2, rootJS) - uses: actions/download-artifact@v3 + - name: Download target directories (3, rediculous-concurrentJVM) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.4.2-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rediculous-concurrentJVM - - name: Inflate target directories (3.4.2, rootJS) + - name: Inflate target directories (3, rediculous-concurrentJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.4.2, rootJVM) - uses: actions/download-artifact@v3 + - name: Download target directories (3, rediculous-concurrentNative) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.4.2-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rediculous-concurrentNative - - name: Inflate target directories (3.4.2, rootJVM) + - name: Inflate target directories (3, rediculous-concurrentNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.4.2, rootNative) - uses: actions/download-artifact@v3 + - name: Download target directories (3, rediculous-concurrentJS) + uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3.4.2-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3-rediculous-concurrentJS - - name: Inflate target directories (3.4.2, rootNative) + - name: Inflate target directories (3, rediculous-concurrentJS) 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 - run: sbt '++ ${{ matrix.scala }}' tlCiRelease - - site: - name: Generate Site + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} + run: sbt tlCiRelease + + dependency-submission: + name: Submit Dependencies + if: github.event_name != 'pull_request' strategy: matrix: os: [ubuntu-latest] - scala: [3.4.2] 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: rediculous-concurrentjvm_2.12 rediculous-concurrentjvm_2.13 rediculous-concurrentjvm_3 rediculous-examples_native0.4_2.12 rediculous-examples_native0.4_2.13 rediculous-examples_native0.4_3 rediculous-concurrentnative_2.12 rediculous-concurrentnative_2.13 rediculous-concurrentnative_3 site_2.12 site_2.13 site_3 rediculous-examples_sjs1_2.12 rediculous-examples_sjs1_2.13 rediculous-examples_sjs1_3 rediculous-concurrentjs_2.12 rediculous-concurrentjs_2.13 rediculous-concurrentjs_3 rediculous-examples_2.12 rediculous-examples_2.13 rediculous-examples_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 '++ ${{ matrix.scala }}' site/tlSite + 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 diff --git a/build.sbt b/build.sbt index d7b48d4..c13c9af 100644 --- a/build.sbt +++ b/build.sbt @@ -13,14 +13,14 @@ ThisBuild / tlCiReleaseBranches := Seq("main") ThisBuild / tlSonatypeUseLegacyHost := true -val catsV = "2.9.0" -val catsEffectV = "3.4.8" -val fs2V = "3.6.1" -val circeV = "0.14.5" +val catsV = "2.11.0" +val catsEffectV = "3.4.11" +val fs2V = "3.10.2" +val circeV = "0.14.8" ThisBuild / testFrameworks += new TestFramework("munit.Framework") -ThisBuild / crossScalaVersions := Seq("2.12.17", "2.13.10", "3.4.2") +ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.14", "3.4.2") // Projects lazy val `rediculous-concurrent` = tlCrossRootProject @@ -95,6 +95,5 @@ lazy val examples = crossProject(JVMPlatform, JSPlatform, NativePlatform) lazy val site = project.in(file("site")) .enablePlugins(TypelevelSitePlugin) + .settings(tlSiteIsTypelevelProject := Some(TypelevelProject.Affiliate)) .dependsOn(core.jvm) - - diff --git a/examples/src/main/scala/HttpCircuiting.scala b/examples/src/main/scala/HttpCircuiting.scala index b5ef6d1..e53b5cf 100644 --- a/examples/src/main/scala/HttpCircuiting.scala +++ b/examples/src/main/scala/HttpCircuiting.scala @@ -14,7 +14,7 @@ object HttpCircuiting extends ResourceApp.Simple { def run: Resource[IO, Unit] = for { connection <- RedisConnection.queued[IO].withHost(host"localhost").withPort(port"6379").build automaticallyCircuitedClient <- EmberClientBuilder.default[IO].build - .map(RedisCircuitedClient(connection)(_)) + .map(RedisCircuitedClient[IO](connection)(_)) } yield () diff --git a/project/build.properties b/project/build.properties index 46e43a9..cb409aa 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.10.1 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index ae7dce6..a3de4c9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.19") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.19") -addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.4.19") +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.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.0") -addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.1.3") \ No newline at end of file +addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.1.3")