Skip to content

Commit

Permalink
Merge pull request #15 from http4s/update/sbt-http4s-org-0.12.1
Browse files Browse the repository at this point in the history
Update to sbt-http4s-org 0.12.1
  • Loading branch information
armanbilge authored Feb 16, 2022
2 parents 30fe8d3 + 55581a0 commit e3b0093
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
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 }}
Expand Down Expand Up @@ -81,9 +82,9 @@ jobs:
if: matrix.java == 'temurin@8'
run: 'sbt ''project ${{ matrix.project }}'' ''++${{ matrix.scala }}'' ''set Global/scalaJSStage := ${{ matrix.sjsStage }}'' headerCheckAll scalafmtCheckAll ''project /'' scalafmtSbtCheck'

- name: fastOptJS
- name: scalaJSLink
if: matrix.project == 'rootJS'
run: 'sbt ''project ${{ matrix.project }}'' ''++${{ matrix.scala }}'' ''set Global/scalaJSStage := ${{ matrix.sjsStage }}'' Test/fastOptJS'
run: 'sbt ''project ${{ matrix.project }}'' ''++${{ matrix.scala }}'' ''set Global/scalaJSStage := ${{ matrix.sjsStage }}'' Test/scalaJSLinkerResult'

- name: Test
run: 'sbt ''project ${{ matrix.project }}'' ''++${{ matrix.scala }}'' ''set Global/scalaJSStage := ${{ matrix.sjsStage }}'' test'
Expand Down Expand Up @@ -219,12 +220,12 @@ jobs:
- name: Import signing key
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
run: echo $PGP_SECRET | base64 -d | gpg --import
run: echo $PGP_SECRET | base64 -di | gpg --import

- name: Import signing key and strip passphrase
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != ''
run: |
echo "$PGP_SECRET" | base64 -d > /tmp/signing-key.gpg
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)
Expand Down
7 changes: 5 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
ThisBuild / tlBaseVersion := "1.0"
ThisBuild / startYear := Some(2022)
ThisBuild / developers += tlGitHubDev("armanbilge", "Arman Bilge")
ThisBuild / tlFatalWarningsInCi := false
ThisBuild / tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "1.0.3").toMap

ThisBuild / crossScalaVersions := Seq("2.12.15", "3.1.1", "2.13.8")

ThisBuild / tlFatalWarningsInCi := false

ThisBuild / githubWorkflowJavaVersions := List("8", "11").map(JavaSpec.temurin(_))
ThisBuild / githubWorkflowBuildMatrixAdditions += "sjsStage" -> List("FastOptStage", "FullOptStage")
ThisBuild / githubWorkflowBuildMatrixExclusions +=
Expand All @@ -15,7 +19,6 @@ lazy val hpack = crossProject(JVMPlatform, JSPlatform)
.in(file("hpack"))
.settings(
name := "hpack",
mimaPreviousArtifacts := Set.empty,
libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-core" % "2.7.0" % Test,
"io.circe" %%% "circe-parser" % "0.14.1" % Test,
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.12.0")
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.12.1")

0 comments on commit e3b0093

Please sign in to comment.