Skip to content

Support Basic Auth for GitHub again #3481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Support Basic Auth for GitHub again #3481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
14 changes: 9 additions & 5 deletions modules/core/src/main/scala/org/scalasteward/core/forge/ForgeAuthAlg.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =>
Expand Down
Loading