Skip to content

Commit

Permalink
try to avoid myget
Browse files Browse the repository at this point in the history
  • Loading branch information
hamnis committed Jul 26, 2023
1 parent 73ae473 commit d6b9ee5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ jobs:

- name: Check binary compatibility
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
env:
MYGET_USERNAME: ${{ secrets.PLATTFORM_MYGET_ENTERPRISE_READ_ID }}
MYGET_PASSWORD: ${{ secrets.PLATTFORM_MYGET_ENTERPRISE_READ_SECRET }}
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues

- name: Generate API documentation
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ ThisBuild / githubWorkflowBuild := {
"BIGQUERY_SERVICE_ACCOUNT" -> "${{secrets.BIGQUERY_SERVICE_ACCOUNT}}",
"ASSERT_CURRENT_GENERATED_FILES" -> "1"
))
case step: WorkflowStep.Sbt if step.name.contains("Check binary compatibility") =>
/* case step: WorkflowStep.Sbt if step.name.contains("Check binary compatibility") =>
step.copy(env = Map(
"MYGET_USERNAME" -> "${{ secrets.PLATTFORM_MYGET_ENTERPRISE_READ_ID }}",
"MYGET_PASSWORD" -> "${{ secrets.PLATTFORM_MYGET_ENTERPRISE_READ_SECRET }}"
))
))*/
case s => s
}
}
Expand All @@ -61,18 +61,18 @@ ThisBuild / tlVersionIntroduced := Map(
)

val commonSettings = Seq(
resolvers += "MyGet - datahub".at(s"https://nrk.myget.org/F/datahub/maven/"),
resolvers += "github".at("https://maven.pkg.github.com/nrkno/bigquery-scala"),
Compile / headerSources := Nil,
Test / headerSources := Nil,
publishTo := {
val MyGet = "https://nrk.myget.org/F/datahub/maven/"
if (isSnapshot.value) None else Some("releases".at(MyGet))
val Github = "https://maven.pkg.github.com/nrkno/bigquery-scala/"
if (isSnapshot.value) None else Some("releases".at(Github))
},
credentials ++= {
(sys.env.get("MYGET_USERNAME"), sys.env.get("MYGET_PASSWORD")) match {
(sys.env.get("GITHUB_USERNAME"), sys.env.get("GITHUB_PASSWORD")) match {
case (Some(username), Some(password)) =>
List(
Credentials("MyGet - datahub", "nrk.myget.org", username, password)
Credentials("Github", "maven.pkg.github.com/", username, password)
)
case _ => Nil
}
Expand Down

0 comments on commit d6b9ee5

Please sign in to comment.