From d6b9ee52c1b4f8f60fef77a14ec55888dfe30289 Mon Sep 17 00:00:00 2001 From: Erlend Hamnaberg Date: Wed, 26 Jul 2023 13:21:30 +0200 Subject: [PATCH] try to avoid myget --- .github/workflows/ci.yml | 3 --- build.sbt | 14 +++++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d7e9f60..4fc169dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/build.sbt b/build.sbt index 817b7933..accc664e 100644 --- a/build.sbt +++ b/build.sbt @@ -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 } } @@ -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 }