Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable preview feature and update Java version #40

Merged
merged 4 commits into from
Oct 21, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
test:
runs-on: ubuntu-latest
env:
JAVA_OPTS: --add-modules jdk.incubator.concurrent
JAVA_OPTS: --enable-preview --add-modules jdk.incubator.concurrent
steps:
- name: Checkout project (pull-request)
if: github.event_name == 'pull_request'
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Setup Scala
uses: olafurpg/setup-scala@v13
Copy link
Contributor

@nomisRev nomisRev Oct 19, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need this Github Action, and use the more commonly used actions/java-setup See olafurpg/setup-scala#49

Sbt 1.7.1 is pre-installed on ubuntu-latest, so we can simply use the setup-java action to install JDK 19.

Suggested change
uses: olafurpg/setup-scala@v13
uses: actions/setup-[email protected]
with:
distribution: 'temurin'
java-version: 19

It's not documented well yet on the actions/setup-java but the temurin Java 19 version is available for all platforms except Windows according to this issue. adoptium/adoptium#171

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same applies to all other workflows that rely on setup-scala

with:
java-version: '[email protected]=tgz+https://download.java.net/java/early_access/loom/6/openjdk-19-loom+6-625_linux-x64_bin.tar.gz'
java-version: '[email protected]=tgz+https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/36/GPL/openjdk-19_linux-x64_bin.tar.gz'
- name: Run checks
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip ci')"
runs-on: ubuntu-latest
env:
JAVA_OPTS: --add-modules jdk.incubator.concurrent
JAVA_OPTS: --enable-preview --add-modules jdk.incubator.concurrent
steps:
- name: Checkout project
uses: actions/checkout@v3
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Setup Scala
uses: olafurpg/setup-scala@v13
with:
java-version: '[email protected]=tgz+https://download.java.net/java/early_access/loom/6/openjdk-19-loom+6-625_linux-x64_bin.tar.gz'
java-version: '[email protected]=tgz+https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/36/GPL/openjdk-19_linux-x64_bin.tar.gz'
- name: Generate documentation
run: sbt ci-docs
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip ci')"
runs-on: ubuntu-latest
env:
JAVA_OPTS: --add-modules jdk.incubator.concurrent
JAVA_OPTS: --enable-preview --add-modules jdk.incubator.concurrent
steps:
- name: Checkout project
uses: actions/checkout@v3
Expand All @@ -22,7 +22,7 @@ jobs:
- name: Setup Scala
uses: olafurpg/setup-scala@v13
with:
java-version: '[email protected]=tgz+https://download.java.net/java/early_access/loom/6/openjdk-19-loom+6-625_linux-x64_bin.tar.gz'
java-version: '[email protected]=tgz+https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/36/GPL/openjdk-19_linux-x64_bin.tar.gz'
- name: Setup GPG
uses: olafurpg/setup-gpg@v3
- name: Release new version
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ support you.
## Moderation

For any questions, concerns, or moderation requests please contact a
[member of the project](AUTHORS.md#maintainers).
[member of the project](AUTHORS.md#maintainers).