Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate sbt-typelevel-ci-release #3

Merged
merged 1 commit into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt '++ ${{ matrix.scala }}' reload +update
run: sbt +update

- name: Setup Java (temurin@11)
id: setup-java-temurin-11
Expand All @@ -67,7 +67,7 @@ jobs:

- name: sbt update
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
run: sbt '++ ${{ matrix.scala }}' reload +update
run: sbt +update

- name: Check that workflows are up to date
run: sbt githubWorkflowCheck
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt reload +update
run: sbt +update

- name: Setup Java (temurin@11)
id: setup-java-temurin-11
Expand All @@ -141,7 +141,7 @@ jobs:

- name: sbt update
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
run: sbt reload +update
run: sbt +update

- name: Download target directories (3)
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
run: sbt reload +update
run: sbt +update

- name: Setup Java (temurin@11)
id: setup-java-temurin-11
Expand All @@ -235,7 +235,7 @@ jobs:

- name: sbt update
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
run: sbt reload +update
run: sbt +update

- name: Submit Dependencies
uses: scalacenter/sbt-dependency-submission@v2
Expand Down
21 changes: 1 addition & 20 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,9 @@ ThisBuild / tlJdkRelease := Some(8)
// mima
ThisBuild / mimaBinaryIssueFilters ++= Seq()

lazy val publishSettings = Seq(
publishMavenStyle := true,
Test / publishArtifact := false,
publishTo := {
if (isSnapshot.value) {
Resolver.sonatypeOssRepos("snapshots").headOption
} else {
Resolver.sonatypeOssRepos("releases").headOption
}
},
releaseCrossBuild := true,
releasePublishArtifactsAction := PgpKeys.publishSigned.value,
credentials ++= (for {
username <- sys.env.get("SONATYPE_USERNAME")
password <- sys.env.get("SONATYPE_PASSWORD")
} yield Credentials("Sonatype Nexus Repository Manager", "oss.sonatype.org", username, password)).toSeq
)

lazy val commonSettings = Defaults.itSettings ++
headerSettings(IntegrationTest) ++
inConfig(IntegrationTest)(ScalafmtPlugin.scalafmtConfigSettings) ++
publishSettings
inConfig(IntegrationTest)(ScalafmtPlugin.scalafmtConfigSettings)

lazy val `pekko-http-metrics` = (project in file("."))
.aggregate(
Expand Down
8 changes: 3 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-RC10")
addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.5.0-RC10")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-RC11")
addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.5.0-RC11")
addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.5.0-RC11")