From bb4ef3c929175c68c4287db5efa1520d691eff72 Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 11 Apr 2023 14:33:00 -0700 Subject: [PATCH 1/2] Updates and Native Build --- .github/workflows/ci.yml | 202 +++++++++++++++++++++++++++-------- .github/workflows/clean.yml | 2 +- build.sbt | 38 ++++--- {site/docs => docs}/index.md | 7 +- project/build.properties | 2 +- project/plugins.sbt | 9 +- 6 files changed, 187 insertions(+), 73 deletions(-) rename {site/docs => docs}/index.md (92%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 966041e..ec20330 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,12 +9,17 @@ name: Continuous Integration on: pull_request: - branches: ['**'] + branches: ['**', '!update/**', '!pr/**'] push: - branches: ['**'] + branches: ['**', '!update/**', '!pr/**'] 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 }} jobs: @@ -23,22 +28,33 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.14, 2.13.8, 3.1.2] - java: [adopt@1.8, adopt@1.11] + scala: [2.12.14, 2.13.8, 3.2.2] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v12 + - name: Download Java (temurin@8) + id: download-java-temurin-8 + if: matrix.java == 'temurin@8' + uses: typelevel/download-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 8 + + - 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: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt @@ -49,25 +65,34 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Setup Ruby - if: matrix.scala == '2.13.8' - uses: ruby/setup-ruby@v1 - with: - ruby-version: 3.0.1 + - name: Check that workflows are up to date + run: sbt githubWorkflowCheck - - name: Install microsite dependencies - if: matrix.scala == '2.13.8' - run: | - gem install saas - gem install jekyll -v 4.2.0 + - name: Test + run: sbt '++ ${{ matrix.scala }}' test - - name: Check that workflows are up to date - run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck' + - name: Check binary compatibility + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues - - run: sbt --client '++${{ matrix.scala }}; test; mimaReportBinaryIssues' + - name: Generate API documentation + if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest' + run: sbt '++ ${{ matrix.scala }}' doc - - if: matrix.scala == '2.13.8' - run: sbt --client '++${{ matrix.scala }}; site/makeMicrosite' + - name: Make target directories + if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') + run: mkdir -p core/.native/target site/target core/.js/target core/.jvm/target 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 core/.native/target site/target core/.js/target core/.jvm/target 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 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }} + path: targets.tar publish: name: Publish Artifacts @@ -77,21 +102,32 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.8] - java: [adopt@1.8] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v12 + - name: Download Java (temurin@8) + id: download-java-temurin-8 + if: matrix.java == 'temurin@8' + uses: typelevel/download-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 8 + + - 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: Cache sbt - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.sbt @@ -102,27 +138,99 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - uses: olafurpg/setup-gpg@v3 + - name: Download target directories (2.12.14) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.14 + + - name: Inflate target directories (2.12.14) + run: | + tar xf targets.tar + rm targets.tar + + - name: Download target directories (2.13.8) + uses: actions/download-artifact@v3 + with: + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.8 + + - name: Inflate target directories (2.13.8) + run: | + tar xf targets.tar + rm targets.tar - - name: Setup Ruby - uses: ruby/setup-ruby@v1 + - name: Download target directories (3.2.2) + uses: actions/download-artifact@v3 with: - ruby-version: 3.0.1 + name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2 - - name: Install microsite dependencies + - name: Inflate target directories (3.2.2) run: | - gem install saas - gem install jekyll -v 4.2.0 + tar xf targets.tar + rm targets.tar - - name: Publish artifacts to Sonatype - env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - run: sbt --client '++${{ matrix.scala }}; ci-release' + - name: Import signing key + if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' + run: echo $PGP_SECRET | base64 -di | gpg --import - - uses: christopherdavenport/create-ghpages-ifnotexists@v1 + - name: Import signing key and strip passphrase + if: env.PGP_SECRET != '' && env.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 + run: sbt '++ ${{ matrix.scala }}' tlCiRelease - - name: Publish microsite - run: sbt --client '++${{ matrix.scala }}; site/publishMicrosite' \ No newline at end of file + site: + name: Generate Site + strategy: + matrix: + os: [ubuntu-latest] + scala: [2.13.8] + java: [temurin@8] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout current branch (full) + uses: actions/checkout@v3 + 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) + 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: 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: Generate site + 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.9.0 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: site/target/docs/site + keep_files: true diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index b535fcc..547aaa4 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -56,4 +56,4 @@ jobs: printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size ghapi -X DELETE $REPO/actions/artifacts/$id done - done \ No newline at end of file + done diff --git a/build.sbt b/build.sbt index 4d83618..8ec8635 100644 --- a/build.sbt +++ b/build.sbt @@ -1,13 +1,27 @@ -import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} -import _root_.io.chrisdavenport.sbtmimaversioncheck.MimaVersionCheckKeys.mimaVersionCheckExcludedVersions +ThisBuild / tlBaseVersion := "0.4" // your current series x.y -val catsV = "2.7.0" -val catsEffectV = "3.3.12" +ThisBuild / organization := "io.chrisdavenport" +ThisBuild / organizationName := "Christopher Davenport" +ThisBuild / licenses := Seq(License.Apache2) +ThisBuild / developers := List( + // your GitHub handle and name + tlGitHubDev("christopherdavenport", "Christopher Davenport") +) + +ThisBuild / tlCiReleaseBranches := Seq("main") + +// true by default, set to false to publish to s01.oss.sonatype.org +ThisBuild / tlSonatypeUseLegacyHost := true + +ThisBuild / testFrameworks += new TestFramework("munit.Framework") + +val catsV = "2.9.0" +val catsEffectV = "3.4.8" val scalaTestV = "3.2.9" -val scala213 = "2.13.8" +val scala213 = "2.13.8" ThisBuild / scalaVersion := scala213 -ThisBuild / crossScalaVersions := Seq("2.12.14", scala213, "3.1.2") +ThisBuild / crossScalaVersions := Seq("2.12.14", scala213, "3.2.2") ThisBuild / licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")) @@ -16,7 +30,7 @@ lazy val `circuit` = project.in(file(".")) .enablePlugins(NoPublishPlugin) .aggregate(core.jvm, core.js) -lazy val core = crossProject(JSPlatform, JVMPlatform) +lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) .crossType(CrossType.Pure) .in(file("core")) .settings( @@ -31,13 +45,5 @@ lazy val core = crossProject(JSPlatform, JVMPlatform) ) lazy val site = project.in(file("site")) - .disablePlugins(MimaPlugin) - .enablePlugins(NoPublishPlugin) - .enablePlugins(DavenverseMicrositePlugin) + .enablePlugins(TypelevelSitePlugin) .dependsOn(core.jvm) - .settings{ - import microsites._ - Seq( - micrositeDescription := "Circuit Breaker for Scala", - ) - } diff --git a/site/docs/index.md b/docs/index.md similarity index 92% rename from site/docs/index.md rename to docs/index.md index fb087fa..72cdafb 100644 --- a/site/docs/index.md +++ b/docs/index.md @@ -1,9 +1,4 @@ ---- -layout: home - ---- - -# circuit - Circuit Breaker for Scala [![Build Status](https://travis-ci.com/ChristopherDavenport/circuit.svg?branch=master)](https://travis-ci.com/ChristopherDavenport/circuit) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.chrisdavenport/circuit_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.chrisdavenport/circuit_2.12) +# circuit - Circuit Breaker for Scala [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.chrisdavenport/circuit_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.chrisdavenport/circuit_2.12) The `CircuitBreaker` is used to provide stability and prevent cascading failures in distributed systems. diff --git a/project/build.properties b/project/build.properties index c8fcab5..46e43a9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.8.2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 4ad111b..7fd15bd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,7 @@ -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.3.1") -addSbtPlugin("io.chrisdavenport" % "sbt-davenverse" % "0.1.4") +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.scala-js" % "sbt-scalajs" % "1.13.0") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0") From a9379a446784f56181d949b4a133fff70dccac2b Mon Sep 17 00:00:00 2001 From: Christopher Davenport Date: Tue, 11 Apr 2023 14:36:17 -0700 Subject: [PATCH 2/2] Update Base Version --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8ec8635..0699475 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / tlBaseVersion := "0.4" // your current series x.y +ThisBuild / tlBaseVersion := "0.6" // your current series x.y ThisBuild / organization := "io.chrisdavenport" ThisBuild / organizationName := "Christopher Davenport"