Compare commits
No commits in common. "sbt2-fixed" and "main" have entirely different histories.
sbt2-fixed
...
main
5 changed files with 40 additions and 36 deletions
|
|
@ -45,24 +45,23 @@ jobs:
|
||||||
echo "Previous Git Tag: $latest_git_tag"
|
echo "Previous Git Tag: $latest_git_tag"
|
||||||
echo "Latest Commit: $latest_commit_message ($GS_RELEASE_TYPE) (SNAPSHOT)"
|
echo "Latest Commit: $latest_commit_message ($GS_RELEASE_TYPE) (SNAPSHOT)"
|
||||||
if [ "$GS_RELEASE_TYPE" = "norelease" ]; then
|
if [ "$GS_RELEASE_TYPE" = "norelease" ]; then
|
||||||
sbt setVersion patch snapshot
|
sbtn -Dsnapshot=true -Drelease="patch" semVerInfo
|
||||||
else
|
else
|
||||||
sbt setVersion $GS_RELEASE_TYPE snapshot
|
sbtn -Dsnapshot=true -Drelease="$GS_RELEASE_TYPE" semVerInfo
|
||||||
fi
|
fi
|
||||||
sbt semVerInfo
|
|
||||||
- name: 'Unit Tests and Code Coverage'
|
- name: 'Unit Tests and Code Coverage'
|
||||||
run: |
|
run: |
|
||||||
sbt clean
|
sbtn clean
|
||||||
sbt coverage
|
sbtn coverage
|
||||||
sbt test
|
sbtn test
|
||||||
sbt coverageReport
|
sbtn coverageReport
|
||||||
- name: 'Publish Snapshot'
|
- name: 'Publish Snapshot'
|
||||||
run: |
|
run: |
|
||||||
echo "Testing env var propagation = ${{ env.GS_RELEASE_TYPE }}"
|
echo "Testing env var propagation = ${{ env.GS_RELEASE_TYPE }}"
|
||||||
if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then
|
if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then
|
||||||
echo "Skipping publish due to GS_RELEASE_TYPE=norelease"
|
echo "Skipping publish due to GS_RELEASE_TYPE=norelease"
|
||||||
else
|
else
|
||||||
sbt coverageOff
|
sbtn coverageOff
|
||||||
sbt clean
|
sbtn clean
|
||||||
sbt publish
|
sbtn publish
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -51,28 +51,27 @@ jobs:
|
||||||
if [ "$GS_RELEASE_TYPE" = "norelease" ]; then
|
if [ "$GS_RELEASE_TYPE" = "norelease" ]; then
|
||||||
echo "Skipping all versioning for 'norelease' commit."
|
echo "Skipping all versioning for 'norelease' commit."
|
||||||
else
|
else
|
||||||
sbt setVersion $GS_RELEASE_TYPE release
|
sbtn -Drelease="$GS_RELEASE_TYPE" semVerInfo
|
||||||
sbt semVerInfo
|
|
||||||
fi
|
fi
|
||||||
- name: 'Unit Tests and Code Coverage'
|
- name: 'Unit Tests and Code Coverage'
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then
|
if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then
|
||||||
echo "Skipping build/test for 'norelease' commit."
|
echo "Skipping build/test for 'norelease' commit."
|
||||||
else
|
else
|
||||||
sbt clean
|
sbtn clean
|
||||||
sbt coverage
|
sbtn coverage
|
||||||
sbt test
|
sbtn test
|
||||||
sbt coverageReport
|
sbtn coverageReport
|
||||||
fi
|
fi
|
||||||
- name: 'Publish Release'
|
- name: 'Publish Release'
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then
|
if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then
|
||||||
echo "Skipping publish for 'norelease' commit."
|
echo "Skipping publish for 'norelease' commit."
|
||||||
else
|
else
|
||||||
sbt coverageOff
|
sbtn coverageOff
|
||||||
sbt clean
|
sbtn clean
|
||||||
sbt semVerWriteVersionToFile
|
sbtn semVerWriteVersionToFile
|
||||||
sbt publish
|
sbtn publish
|
||||||
fi
|
fi
|
||||||
- name: 'Create Git Tag'
|
- name: 'Create Git Tag'
|
||||||
run: |
|
run: |
|
||||||
|
|
|
||||||
30
build.sbt
30
build.sbt
|
|
@ -1,4 +1,4 @@
|
||||||
val scala3: String = "3.8.4"
|
val scala3: String = "3.8.3"
|
||||||
|
|
||||||
ThisBuild / scalaVersion := scala3
|
ThisBuild / scalaVersion := scala3
|
||||||
ThisBuild / versionScheme := Some("semver-spec")
|
ThisBuild / versionScheme := Some("semver-spec")
|
||||||
|
|
@ -10,26 +10,32 @@ ThisBuild / licenses := Seq(
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val noPublishSettings = Seq(
|
||||||
|
publish := {}
|
||||||
|
)
|
||||||
|
|
||||||
val sharedSettings = Seq(
|
val sharedSettings = Seq(
|
||||||
scalaVersion := scala3,
|
scalaVersion := scala3,
|
||||||
|
version := semVerSelected.value,
|
||||||
coverageFailOnMinimum := true
|
coverageFailOnMinimum := true
|
||||||
// coverageMinimumStmtTotal := 100,
|
// coverageMinimumStmtTotal := 100,
|
||||||
// coverageMinimumBranchTotal := 100
|
// coverageMinimumBranchTotal := 100
|
||||||
)
|
)
|
||||||
|
|
||||||
val Deps = (
|
val Deps = new {
|
||||||
Cats = (
|
|
||||||
Core = "org.typelevel" %% "cats-core" % "2.13.0",
|
|
||||||
Effect = "org.typelevel" %% "cats-effect" % "3.7.0"
|
|
||||||
),
|
|
||||||
|
|
||||||
Fs2 = (
|
val Cats = new {
|
||||||
Core = "co.fs2" %% "fs2-core" % "3.13.0",
|
val Core: ModuleID = "org.typelevel" %% "cats-core" % "2.13.0"
|
||||||
IO = "co.fs2" %% "fs2-io" % "3.13.0"
|
val Effect: ModuleID = "org.typelevel" %% "cats-effect" % "3.7.0"
|
||||||
),
|
}
|
||||||
|
|
||||||
MUnit = "org.scalameta" %% "munit" % "1.3.0" % Test
|
val Fs2 = new {
|
||||||
)
|
val Core: ModuleID = "co.fs2" %% "fs2-core" % "3.13.0"
|
||||||
|
val IO: ModuleID = "co.fs2" %% "fs2-io" % "3.13.0"
|
||||||
|
}
|
||||||
|
|
||||||
|
val MUnit: ModuleID = "org.scalameta" %% "munit" % "1.3.0" % Test
|
||||||
|
}
|
||||||
|
|
||||||
lazy val testSettings = Seq(
|
lazy val testSettings = Seq(
|
||||||
libraryDependencies ++= Seq(
|
libraryDependencies ++= Seq(
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
sbt.version=2.0.3
|
sbt.version=1.12.9
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ externalResolvers := Seq(
|
||||||
"Garrity Software Releases" at "https://maven.garrity.co/gs"
|
"Garrity Software Releases" at "https://maven.garrity.co/gs"
|
||||||
)
|
)
|
||||||
|
|
||||||
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
|
|
||||||
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4")
|
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4")
|
||||||
addSbtPlugin("gs" % "sbt-garrity-software" % "0.8.0")
|
addSbtPlugin("gs" % "sbt-garrity-software" % "0.7.0")
|
||||||
addSbtPlugin("gs" % "sbt-gs-semver" % "0.4.1")
|
addSbtPlugin("gs" % "sbt-gs-semver" % "0.3.0")
|
||||||
|
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue