Skip to content

Commit

Permalink
Updates and fixup for latest gha-scala-library-release-workflow
Browse files Browse the repository at this point in the history
In particular, updating config for:

* guardian/gha-scala-library-release-workflow#23 - Sonatype token authentication
  • Loading branch information
rtyley committed Jun 26, 2024
1 parent f689288 commit 70e188c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: corretto
java-version: 17 # Currently Java 17 required by `s3mock-testcontainers`
java-version: 21 # Currently Java 17 required by `s3mock-testcontainers`
cache: sbt
- name: Build and Test
run: sbt -v +test
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ on:

jobs:
release:
uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@use-sonatype-token-rather-than-username-password-auth
uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@main
permissions: { contents: write, pull-requests: write }
with:
SONATYPE_PROFILE_NAME: 'com.madgag'
SONATYPE_CREDENTIAL_HOST: 's01.oss.sonatype.org'
secrets:
SONATYPE_TOKEN_USERNAME: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_TOKEN_USERNAME }}
SONATYPE_TOKEN_PASSWORD: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_TOKEN_PASSWORD }}
SONATYPE_TOKEN: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_TOKEN }}
PGP_PRIVATE_KEY: ${{ secrets.AUTOMATED_MAVEN_RELEASE_PGP_SECRET }}
GITHUB_APP_PRIVATE_KEY: ${{ secrets.AUTOMATED_MAVEN_RELEASE_GITHUB_APP_PRIVATE_KEY }}
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import ReleaseTransformations.*
import sbtversionpolicy.withsbtrelease.ReleaseVersion

ThisBuild / scalaVersion := "2.13.12"
ThisBuild / scalaVersion := "2.13.14"
ThisBuild / crossScalaVersions := Seq(
scalaVersion.value,
"3.3.1",
"2.12.18"
"3.3.3",
"2.12.19"
)
ThisBuild / scalacOptions := Seq("-deprecation", "-release:11")

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.9.8
sbt.version = 1.10.0
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")

addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.0")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")

0 comments on commit 70e188c

Please sign in to comment.