Skip to content

Commit

Permalink
Merge pull request #569 from http4s/update-ci
Browse files Browse the repository at this point in the history
Update `sbt-http4s-org` and use `adoptium@8` in CI
  • Loading branch information
danicheg authored Sep 30, 2021
2 parents d180299 + 179f2ca commit 72921dc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ on:
tags: [v*, v*]

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
JABBA_INDEX: 'https://github.com/typelevel/jdk-index/raw/main/index.json'
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
build:
Expand All @@ -28,7 +29,7 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.15, 2.13.6, 3.0.2]
java: [adopt@1.8]
java: [adoptium@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down Expand Up @@ -66,7 +67,7 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.13.6]
java: [adopt@1.8]
java: [adoptium@8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ lazy val commonSettings = Seq(
)
)

ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8")
ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@8")

ThisBuild / githubWorkflowTargetTags ++= Seq("v*")

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.1")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.0")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
addSbtPlugin("org.http4s" %% "sbt-http4s-org" % "0.8.2")
addSbtPlugin("org.http4s" %% "sbt-http4s-org" % "0.8.3")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")

0 comments on commit 72921dc

Please sign in to comment.