From 523be2ac39a9715585bb01f5810d395d5cb599c6 Mon Sep 17 00:00:00 2001 From: Pat Garrity Date: Thu, 25 Apr 2024 22:20:20 -0500 Subject: [PATCH 1/3] Fixing builds by explicitly disabling coverage. --- .forgejo/workflows/release.yaml | 3 ++- README.md | 2 +- build.sbt | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 8351605..964efdd 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -59,7 +59,7 @@ jobs: echo "Skipping build/test for 'norelease' commit." else sbtn clean - sbtn coverage + sbtn 'set coverageEnabled := true' sbtn test sbtn coverageReport fi @@ -69,6 +69,7 @@ jobs: echo "Skipping publish for 'norelease' commit." else sbtn clean + sbtn 'set coverageEnabled := false' sbtn semVerWriteVersionToFile sbtn publish fi diff --git a/README.md b/README.md index 43c52ea..48e7b8d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This artifact is available in the Garrity Software Maven repository. ```scala externalResolvers += - "Garrity Software Releases" at "https://maven.garrity.co/releases" + "Garrity Software Releases" at "https://maven.garrity.co/gs" val GsHex: ModuleID = "gs" %% "gs-hex-v0" % "$VERSION" diff --git a/build.sbt b/build.sbt index 560cdac..69385e4 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,10 @@ val scala3: String = "3.4.1" +externalResolvers := Seq( + "Garrity Software Mirror" at "https://maven.garrity.co/releases", + "Garrity Software Releases" at "https://maven.garrity.co/gs" +) + ThisBuild / scalaVersion := scala3 ThisBuild / versionScheme := Some("semver-spec") ThisBuild / gsProjectName := "gs-hex" -- 2.43.0 From 8aadf940e058129f301bbbd77196bd5e4e78b20a Mon Sep 17 00:00:00 2001 From: Pat Garrity Date: Thu, 25 Apr 2024 22:22:03 -0500 Subject: [PATCH 2/3] Ensure that snapshot builds are also fixed. --- .forgejo/workflows/pull_request.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/pull_request.yaml b/.forgejo/workflows/pull_request.yaml index bba274a..139ac3f 100644 --- a/.forgejo/workflows/pull_request.yaml +++ b/.forgejo/workflows/pull_request.yaml @@ -62,5 +62,6 @@ jobs: echo "Skipping publish due to GS_RELEASE_TYPE=norelease" else sbtn clean + sbtn 'set coverageEnabled := true' sbtn publish fi -- 2.43.0 From be2f90148b7ee70432e3cc3e67204ff45a0c48bc Mon Sep 17 00:00:00 2001 From: Pat Garrity Date: Thu, 25 Apr 2024 22:23:15 -0500 Subject: [PATCH 3/3] Use coverageOff --- .forgejo/workflows/pull_request.yaml | 2 +- .forgejo/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/pull_request.yaml b/.forgejo/workflows/pull_request.yaml index 139ac3f..ac2ddc8 100644 --- a/.forgejo/workflows/pull_request.yaml +++ b/.forgejo/workflows/pull_request.yaml @@ -62,6 +62,6 @@ jobs: echo "Skipping publish due to GS_RELEASE_TYPE=norelease" else sbtn clean - sbtn 'set coverageEnabled := true' + sbtn coverageOff sbtn publish fi diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 964efdd..fc532f5 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -69,7 +69,7 @@ jobs: echo "Skipping publish for 'norelease' commit." else sbtn clean - sbtn 'set coverageEnabled := false' + sbtn coverageOff sbtn semVerWriteVersionToFile sbtn publish fi -- 2.43.0