From 36ad2a6101c15f6b60622be75138d1b67a0f9373 Mon Sep 17 00:00:00 2001 From: Thibaut Robert Date: Wed, 18 Aug 2021 11:09:29 +0200 Subject: [PATCH 1/3] Configure publishing to Github Packages && Bump version to 0.0.22-cdk --- .github/workflows/build.yml | 4 ++-- .github/workflows/release.yml | 9 ++------- build.sbt | 5 ++++- project/plugins.sbt | 18 +++++++++--------- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 985ac0ce..b382db48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: run: docker-compose up -d - name: Compile (All) and Test/Coverage (Scala 2 Only) run: sbt headerCheck +clean coverage test docs/makeSite coverageReport coverageOff +test + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Shut down Postgres instances run: docker-compose down - - name: Upload code coverage data - run: bash <(curl -s https://codecov.io/bash) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86fe0744..1986258e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,7 +1,6 @@ name: Release on: push: - branches: [master] tags: ["*"] jobs: publish: @@ -9,11 +8,7 @@ jobs: steps: - uses: actions/checkout@v1 - uses: olafurpg/setup-scala@v10 - - uses: olafurpg/setup-gpg@v3 - name: Publish - run: sbt ci-release + run: sbt publish env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.sbt b/build.sbt index bc292d15..90359686 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ - +Global / version := "0.0.22-cdk" // Our Scala versions. lazy val `scala-2.12` = "2.12.13" @@ -22,6 +22,9 @@ lazy val commonSettings = Seq( developers := List( Developer("tpolecat", "Rob Norris", "rob_norris@mac.com", url("http://www.tpolecat.org")) ), + githubOwner := "conduktor", + githubRepository := "skunk", + githubTokenSource := TokenSource.Environment("GITHUB_TOKEN"), // Headers headerMappings := headerMappings.value + (HeaderFileType.scala -> HeaderCommentStyle.cppStyleLineComment), diff --git a/project/plugins.sbt b/project/plugins.sbt index 69d0516e..ea6ac834 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,9 @@ -addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") -addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2") -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") -addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.20") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2") +addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") +addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2") +addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") +addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.20") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2") From 0a751d1b8d4edc977464407e5f64407385a0ded5 Mon Sep 17 00:00:00 2001 From: Thibaut Robert Date: Wed, 18 Aug 2021 11:11:24 +0200 Subject: [PATCH 2/3] Set TCP_NODELAY --- modules/core/src/main/scala/net/BitVectorSocket.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/scala/net/BitVectorSocket.scala b/modules/core/src/main/scala/net/BitVectorSocket.scala index 070c328a..b36ca685 100644 --- a/modules/core/src/main/scala/net/BitVectorSocket.scala +++ b/modules/core/src/main/scala/net/BitVectorSocket.scala @@ -81,7 +81,7 @@ object BitVectorSocket { sslOptions: Option[SSLNegotiation.Options[F]], ): Resource[F, BitVectorSocket[F]] = for { - sock <- sg.client[F](new InetSocketAddress(host, port)) + sock <- sg.client[F](new InetSocketAddress(host, port), noDelay = true) sockʹ <- sslOptions.fold(sock.pure[Resource[F, *]])(SSLNegotiation.negotiateSSL(sock, readTimeout, writeTimeout, _)) } yield fromSocket(sockʹ, readTimeout, writeTimeout) From 8a0b04e15ad58f31d32c22b4560e2feb98db26e7 Mon Sep 17 00:00:00 2001 From: Thibaut Robert Date: Wed, 18 Aug 2021 13:58:16 +0200 Subject: [PATCH 3/3] Fix version number --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 90359686..c2b13ca4 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -Global / version := "0.0.22-cdk" +Global / version := "0.0.28-cdk" // Our Scala versions. lazy val `scala-2.12` = "2.12.13"