Revised defaults to use environment variables

r2d211 · Mar 3, 2020 · e64d8e9 · e64d8e9
1 parent e802d48
commit e64d8e9
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/main/scala/sbtghpackages/GitHubPackagesPlugin.scala b/src/main/scala/sbtghpackages/GitHubPackagesPlugin.scala
@@ -20,7 +20,6 @@ import sbt._, Keys._
 
 import scala.sys.process._
 import scala.util.Try
-import scala.util.control.NonFatal
 
 object GitHubPackagesPlugin extends AutoPlugin {
   @volatile
@@ -41,16 +40,10 @@ object GitHubPackagesPlugin extends AutoPlugin {
 
   import autoImport._
 
-  val userDefaults = try {
-    val actor = "git config github.actor".!!.trim
-    Seq(githubActor := actor)
-  } catch {
-    case NonFatal(_) =>
-      Seq.empty
-  }
+  val userDefaults = sys.env.get("GITHUB_ACTOR").toSeq.map(githubActor := _)
 
   val authenticationSettings = Seq(
-    githubTokenSource := TokenSource.GitConfig("github.token"),
+    githubTokenSource := TokenSource.Environment("GITHUB_TOKEN"),
 
     credentials += {
       val src = githubTokenSource.value
@@ -84,6 +77,8 @@ object GitHubPackagesPlugin extends AutoPlugin {
       }
     },
 
+    resolvers ++= githubOwner.?.value.toSeq.map(Resolver.githubPackages(_)),
+
     scmInfo := {
       for {
         owner <- githubOwner.?.value