Support Basic Auth for GitHub again

scala-steward-org · Nov 20, 2024 · f182c2f · f182c2f
1 parent 26c80c7
commit f182c2f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -85,7 +85,7 @@ jobs:
 
       - uses: coursier/setup-action@v1
         with:
-          apps: scalafmt
+          apps: 'scalafmt:3.8.3'
 
       - name: Build project
         run: sbt '++ ${{ matrix.scala }}' validate

diff --git a/build.sbt b/build.sbt
@@ -54,8 +54,10 @@ ThisBuild / githubWorkflowPublish := Seq(
 ThisBuild / githubWorkflowJavaVersions := Seq("21", "17", "11").map(JavaSpec(Temurin, _))
 ThisBuild / githubWorkflowBuild :=
   Seq(
-    WorkflowStep
-      .Use(UseRef.Public("coursier", "setup-action", "v1"), params = Map("apps" -> "scalafmt")),
+    WorkflowStep.Use(
+      UseRef.Public("coursier", "setup-action", "v1"),
+      params = Map("apps" -> "scalafmt:3.8.3")
+    ),
     WorkflowStep.Sbt(List("validate"), name = Some("Build project")),
     WorkflowStep.Use(
       UseRef.Public("codecov", "codecov-action", "v3"),

diff --git a/modules/core/src/main/scala/org/scalasteward/core/forge/ForgeAuthAlg.scala b/modules/core/src/main/scala/org/scalasteward/core/forge/ForgeAuthAlg.scala
@@ -54,11 +54,15 @@ object ForgeAuthAlg {
           config.gitCfg.gitAskPass
         )
       case GitHub =>
-        val gitHub =
-          config.githubApp.getOrElse(
-            throw new IllegalArgumentException("GitHub app configuration is missing")
-          )
-        new GitHubAuthAlg(config.forgeCfg.apiHost, gitHub.id, gitHub.keyFile)
+        config.githubApp match {
+          case Some(gitHub) => new GitHubAuthAlg(config.forgeCfg.apiHost, gitHub.id, gitHub.keyFile)
+          case None =>
+            new BasicAuthAlg(
+              config.forgeCfg.apiHost,
+              config.forgeCfg.login,
+              config.gitCfg.gitAskPass
+            )
+        }
       case GitLab =>
         new GitLabAuthAlg(config.forgeCfg.apiHost, config.forgeCfg.login, config.gitCfg.gitAskPass)
       case Gitea =>