Skip to content

Commit 264ad30

Browse files
authored
Revert "Revert "WX-1409 Java 17 (#7342)" (#7343)"
This reverts commit 227778a.
1 parent 227778a commit 264ad30

File tree

31 files changed

+57
-776
lines changed

31 files changed

+57
-776
lines changed

.github/set_up_cromwell_action/action.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
name: 'Set Up Cromwell Steps'
44
description: Specific steps that will set up git secrets, java, sbt, and Cromwell on the local machine.
55
inputs:
6-
cromwell_repo_token: #As an input to this action, you are required to pass in a token that can be used to authenticate while checking out Cromwell.
6+
cromwell_repo_token:
7+
description: "As an input to this action, you are required to pass in a token that can be used to authenticate while checking out Cromwell."
78
required: true
89

910
runs:
@@ -12,13 +13,13 @@ runs:
1213
#Allows this github action to use a cache to store stuff like Java and sbt files between runs.
1314
- uses: actions/checkout@v3
1415
name: Checkout Coursier Cache
15-
- uses: coursier/cache-action@v6
16+
- uses: coursier/cache-action@v6
1617
name: Enable Coursier Cache
1718

1819
#Cromwell requires git-secrets be setup. Here, we set up secrets and verify success with a script.
1920
- name: Git secrets setup
2021
run: |
21-
git clone https://github.com/awslabs/git-secrets.git ~/git-secrets
22+
git clone --quiet https://github.com/awslabs/git-secrets.git ~/git-secrets
2223
cd ~/git-secrets
2324
git checkout ad82d68ee924906a0401dfd48de5057731a9bc84
2425
sudo make install
@@ -43,5 +44,4 @@ runs:
4344
uses: actions/setup-java@v3
4445
with:
4546
distribution: temurin
46-
java-version: 11
47-
47+
java-version: 17

.github/workflows/chart_update_on_merge.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ jobs:
2323
repository: broadinstitute/cromwell
2424
token: ${{ secrets.BROADBOT_GITHUB_TOKEN }} # Has to be set at checkout AND later when pushing to work
2525
path: cromwell
26-
- uses: olafurpg/setup-scala@v10
26+
- uses: actions/setup-java@v4
2727
with:
28-
java-version: [email protected]
28+
distribution: 'temurin'
29+
java-version: '17'
2930
- name: Clone Cromwhelm
3031
uses: actions/checkout@v2
3132
with:

.github/workflows/docker_build_test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ jobs:
2525
repository: broadinstitute/cromwell
2626
token: ${{ secrets.BROADBOT_GITHUB_TOKEN }}
2727
path: cromwell
28-
- uses: olafurpg/setup-scala@v10
28+
- uses: actions/setup-java@v4
2929
with:
30-
java-version: [email protected]
30+
distribution: 'temurin'
31+
java-version: '17'
3132
# The following invocation should be as similar as possible to the one in chart_update_on_merge.yml
3233
# To state the obvious: This test should not publish anything. It should simply verify that the build completes.
3334
- name: Build Cromwell Docker

.github/workflows/integration_tests.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ jobs:
104104
set -e
105105
echo Running test.sh
106106
./src/ci/bin/test.sh
107+
# If a build step fails, activate SSH and idle for 60 minutes
108+
# - name: Setup tmate session
109+
# if: ${{ failure() }}
110+
# uses: mxschmitt/action-tmate@v3
111+
# timeout-minutes: 60
112+
# with:
113+
# limit-access-to-actor: true
114+
# detached: true
107115
# always() is some github magic that forces the following step to run, even when the previous fails.
108116
# Without it, the if statement won't be evaluated on a test failure.
109117
- uses: ravsamhq/notify-slack-action@v2

.github/workflows/trivy.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ jobs:
2020
- uses: actions/checkout@v2
2121

2222
# fetch SBT package
23-
- uses: olafurpg/setup-scala@v10
23+
- uses: actions/setup-java@v4
2424
with:
25-
java-version: [email protected]
25+
distribution: 'temurin'
26+
java-version: '17'
2627

2728
# set up SBT cache
2829
- uses: actions/cache@v2

.sdkmanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Enable auto-env through the sdkman_auto_env config
22
# Add key=value pairs of SDKs to use below
3-
java=11.0.11.hs-adpt
3+
java=17.0.9-tem

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Cromwell Change Log
22

3+
## 87 Release Notes
4+
5+
### Java 17
6+
7+
As of this version, a distribution of Java 17 is required to run Cromwell. Cromwell is developed, tested, and
8+
containerized using [Eclipse Temurin](https://adoptium.net/temurin/releases/?version=17).
9+
310
## 86 Release Notes
411

512
### GCP Batch

centaur/src/main/scala/centaur/api/DaemonizedDefaultThreadFactory.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger
1414
* > main thread).
1515
*/
1616
object DaemonizedDefaultThreadFactory extends ThreadFactory {
17-
private val s = System.getSecurityManager
18-
private val group = if (s != null) s.getThreadGroup else Thread.currentThread.getThreadGroup
17+
private val group = Thread.currentThread.getThreadGroup
1918
private val threadNumber = new AtomicInteger(1)
2019
private val namePrefix = "daemonpool-thread-"
2120

cloud-nio/cloud-nio-spi/src/main/scala/cloud/nio/spi/CloudNioPath.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class CloudNioPath(filesystem: CloudNioFileSystem, private[spi] val unixPath: Un
176176
): WatchKey = throw new UnsupportedOperationException
177177

178178
override def iterator(): java.util.Iterator[Path] =
179-
if (unixPath.isEmpty || unixPath.isRoot) {
179+
if (unixPath.izEmpty || unixPath.isRoot) {
180180
java.util.Collections.emptyIterator()
181181
} else {
182182
unixPath.split().to(LazyList).map(part => newPath(UnixPath.getPath(part)).asInstanceOf[Path]).iterator.asJava

cloud-nio/cloud-nio-spi/src/main/scala/cloud/nio/spi/UnixPath.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ final private[spi] case class UnixPath(path: String) extends CharSequence {
6767

6868
def isAbsolute: Boolean = UnixPath.isAbsolute(path)
6969

70-
def isEmpty: Boolean = path.isEmpty
70+
def izEmpty: Boolean = path.isEmpty
7171

7272
def hasTrailingSeparator: Boolean = UnixPath.hasTrailingSeparator(path)
7373

0 commit comments

Comments
 (0)