From 868d804679694030432519e6d237cd7749794e0a Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 14 Nov 2020 19:30:57 -0500
Subject: [PATCH] Nightly requires extra resolver

---
 .github/workflows/nightly.yml |  2 +-
 build.sbt                     | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7fbd37d37..0a9db3e62 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -46,7 +46,7 @@ jobs:
         export BUILD_VERSION="1.4.0-bin-${TIMESTAMP}"
         echo publishing to Package Registry $RELEASE_GITHUB_PACKAGE_REGISTRY
         cd io
-        sbt -v -Dsbt.sbtbintray=false +publishLocal +publish
+        sbt -v -Dsbt.sbtbintray=false +publish
         cd ../
         sbt -Dsbtlm.path=$HOME/work/sbt/sbt/librarymanagement -Dsbtzinc.path=$HOME/work/sbt/sbt/zinc -Dsbt.sbtbintray=false -Dsbt.build.fatal=false "+lowerUtils/publish; {librarymanagement}/publish; {zinc}/publish; upperModules/publish"
         rm -rf "$HOME/.ivy2/local" || true
diff --git a/build.sbt b/build.sbt
index f5939a8c3..3a05107ba 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1542,14 +1542,15 @@ def customCommands: Seq[Setting[_]] = Seq(
   }
 )
 
+def githubPackageRegistry: Option[Resolver] =
+  sys.env.get("RELEASE_GITHUB_PACKAGE_REGISTRY") map { repo =>
+    s"GitHub Package Registry ($repo)" at s"https://maven.pkg.github.com/$repo"
+  }
 ThisBuild / publishTo := {
   val old = (ThisBuild / publishTo).value
-  sys.env.get("RELEASE_GITHUB_PACKAGE_REGISTRY") match {
-    case Some(repo) =>
-      Some(s"GitHub Package Registry ($repo)" at s"https://maven.pkg.github.com/$repo")
-    case _ => old
-  }
+  githubPackageRegistry orElse old
 }
+ThisBuild / resolvers ++= githubPackageRegistry.toList
 ThisBuild / credentials ++= {
   sys.env.get("GITHUB_TOKEN") match {
     case Some(token) =>