diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 890be63..456416c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: scala_versions: description: 'JSON array of Scala versions to build against' type: string - default: '["2.13.18", "3.3.8"]' + default: '["2.13.x", "3.3.x"]' java_version: description: 'JDK version' type: string diff --git a/README.md b/README.md index 02f1809..b068a80 100644 --- a/README.md +++ b/README.md @@ -45,17 +45,17 @@ alternatives and drops the security rating to C: ### Inputs -| input | default | notes | -|---------------------|--------------------------|------------------------------------------------------------------------------| -| `scala_versions` | `'["2.13.18", "3.3.8"]'` | JSON array; becomes the build matrix | -| `java_version` | `'17'` | | -| `java_distribution` | `'temurin'` | | -| `java_version_file` | `''` | e.g. `'.java-version'`; overrides `java_version` | -| `test_task` | auto | `testFull` on sbt 2, `test` on sbt 1, read from `project/build.properties` | -| `clean_task` | auto | `cleanFull` on sbt 2, `clean` on sbt 1, read from `project/build.properties` | -| `sonar` | `false` | run a SonarQube Cloud scan, see below | -| `sonar_project_key` | `_` | | -| `sonar_args` | `''` | extra `-D` arguments for the scanner | +| input | default | notes | +|---------------------|-------------------------|------------------------------------------------------------------------------| +| `scala_versions` | `'["2.13.x", "3.3.x"]'` | JSON array; becomes the build matrix | +| `java_version` | `'17'` | | +| `java_distribution` | `'temurin'` | | +| `java_version_file` | `''` | e.g. `'.java-version'`; overrides `java_version` | +| `test_task` | auto | `testFull` on sbt 2, `test` on sbt 1, read from `project/build.properties` | +| `clean_task` | auto | `cleanFull` on sbt 2, `clean` on sbt 1, read from `project/build.properties` | +| `sonar` | `false` | run a SonarQube Cloud scan, see below | +| `sonar_project_key` | `_` | | +| `sonar_args` | `''` | extra `-D` arguments for the scanner | Example for a project without `sbt-version-policy` and on a different Scala set: @@ -64,7 +64,7 @@ jobs: test: uses: evolution-gaming/scala-github-actions/.github/workflows/ci.yml@ # v6.4.0 with: - scala_versions: '["2.13.18", "3.3.7"]' + scala_versions: '["2.13.x", "3.9.x"]' ``` To take the JDK version from the project's `.java-version` file instead of `java_version`: