diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index f710bc0..6973bdd 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -13,16 +13,17 @@ jobs: - 1.10.1 - 0.13.18 steps: - - uses: actions/checkout@v3 - - uses: olafurpg/setup-scala@v14 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: - java-version: adopt@1.${{matrix.java}} - - uses: actions/cache@v3 + distribution: adopt + java-version: 8 + - uses: actions/cache@v4 with: path: ~/.ivy2/cache key: ivy-${{hashFiles('**/*.sbt')}}-${{matrix.sbt}} restore-keys: ivy- - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.sbt key: sbt-${{hashFiles('**/*.sbt')}}-${{hashFiles('project/build.properties')}}-${{matrix.sbt}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e54dc5f..bca7949 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,15 +8,13 @@ jobs: runs-on: ubuntu-latest if: github.repository == 'scapegoat-scala/sbt-scapegoat' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - run: git fetch --prune --unshallow + - uses: actions/setup-java@v4 with: - fetch-depth: 0 - - uses: olafurpg/setup-scala@v14 - with: - java-version: adopt@1.8 - - run: | - echo ${PGP_SECRET:0:4}...${PGP_SECRET: -4} - sbt ci-release + distribution: adopt + java-version: 8 + - run: sbt ci-release env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} diff --git a/build.sbt b/build.sbt index 20d6510..588d55d 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,3 @@ crossSbtVersions := Seq("0.13.18", "1.5.8") Test / publishArtifact := false Test / parallelExecution := false - -sonatypeCredentialHost := "s01.oss.sonatype.org" -sonatypeRepository := "https://s01.oss.sonatype.org/service/local" -