Skip to content

Commit

Permalink
chore: Minor updates:
Browse files Browse the repository at this point in the history
- Update to latest Scalatestplus version embedded in the artifact ID, which Scala Steward is unable to recognize
- Adding JDK21 support to the build actions
- Adding a small maintenance section to the readme describing the process used for maintaining CI jobs and cutting a release
  • Loading branch information
dkichler committed Dec 6, 2024
1 parent 2432a6c commit 7f57d51
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 4 deletions.
18 changes: 17 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.20]
java: [zulu@8, temurin@11, temurin@17]
java: [zulu@8, temurin@11, temurin@17, temurin@21]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down Expand Up @@ -56,6 +56,14 @@ jobs:
java-version: 17
cache: sbt

- name: Setup Java (temurin@21)
if: matrix.java == 'temurin@21'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
cache: sbt

- name: Setup sbt
uses: sbt/setup-sbt@v1

Expand Down Expand Up @@ -113,6 +121,14 @@ jobs:
java-version: 17
cache: sbt

- name: Setup Java (temurin@21)
if: matrix.java == 'temurin@21'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
cache: sbt

- name: Setup sbt
uses: sbt/setup-sbt@v1

Expand Down
18 changes: 17 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,22 @@ _Note_: By default these patterns are applied _in addition_ to the default patt
conventionalPatternsAdditive := false
```

# License
## Maintenance

### CI
This project uses the [sbt-ci-release](https://github.com/sbt/sbt-ci-release) for generating GitHub actions in the `.github` actions directory, based on declared build configuration in `github-actions.sbt`.

When making changes to `github-actions.sbt` job declarations, the Github actions should be updated to reflect these changes by running the following task:

```
sbt githubWorkflowGenerate
```

### Releasing

To release a new version of this plugin simply create a new tag against the intended release commit which should trigger the `release` Gitbhub action.


## License

This software is under the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0.html).
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ libraryDependencies ++= Seq(
"com.vdurmont" % "semver4j" % "3.1.0",
"org.scalatest" %% "scalatest" % "3.2.19" % Test,
"org.scalacheck" %% "scalacheck" % "1.18.1" % Test,
"org.scalatestplus" %% "scalacheck-1-16" % "3.2.14.0" % Test
"org.scalatestplus" %% "scalacheck-1-18" % "3.2.19.0" % Test
)

// sbt plugin dependencies
Expand Down
2 changes: 1 addition & 1 deletion github-actions.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
inThisBuild(
Seq(
githubWorkflowJavaVersions ++= Seq(JavaSpec.temurin("11"), JavaSpec.temurin("17")),
githubWorkflowJavaVersions ++= Seq(JavaSpec.temurin("11"), JavaSpec.temurin("17"), JavaSpec.temurin("21")),
githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "scripted"))),
githubWorkflowTargetTags ++= Seq("v*"),
githubWorkflowPublishTargetBranches += RefPredicate.StartsWith(Ref.Tag("v")),
Expand Down

0 comments on commit 7f57d51

Please sign in to comment.