Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into release/v0.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
devinrsmith committed Nov 4, 2021
2 parents e01f699 + 81abc04 commit 17170fd
Show file tree
Hide file tree
Showing 28 changed files with 612 additions and 145 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/build-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -99,17 +99,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -181,17 +181,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -287,17 +287,17 @@ jobs:
- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/check-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -65,5 +65,5 @@ jobs:
if: failure()
with:
name: check-ci-jvm-err
path: '*_pid*.log'
path: '**/*_pid*.log'
if-no-files-found: ignore
34 changes: 18 additions & 16 deletions .github/workflows/docs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,25 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

# TODO(deephaven-core#1513): Remove non-LTS JDK 15 as part of javadocs process
- name: Setup JDK 15
id: setup-java-15
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '15.0.4'
java-version: '15'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -76,24 +77,25 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

# TODO(deephaven-core#1513): Remove non-LTS JDK 15 as part of javadocs process
- name: Setup JDK 15
id: setup-java-15
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '15.0.4'
java-version: '15'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -142,9 +144,9 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Set JAVA_HOME
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/long-check-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -61,5 +61,5 @@ jobs:
if: failure()
with:
name: long-check-ci-jvm-err
path: '*_pid*.log'
path: '**/*_pid*.log'
if-no-files-found: ignore
10 changes: 5 additions & 5 deletions .github/workflows/nightly-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down
48 changes: 24 additions & 24 deletions .github/workflows/nightly-check-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
if: failure()
with:
name: nightly-check-ci-jvm-err
path: '*_pid*.log'
path: '**/*_pid*.log'
if-no-files-found: ignore

- name: Publish Test Results
Expand Down Expand Up @@ -95,17 +95,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
if: failure()
with:
name: nightly-testSerial-ci-jvm-err
path: '*_pid*.log'
path: '**/*_pid*.log'
if-no-files-found: ignore

- name: Publish Test Results
Expand Down Expand Up @@ -171,17 +171,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
if: failure()
with:
name: nightly-testParallel-ci-jvm-err
path: '*_pid*.log'
path: '**/*_pid*.log'
if-no-files-found: ignore

- name: Publish Test Results
Expand Down Expand Up @@ -247,17 +247,17 @@ jobs:

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
distribution: 'temurin'
java-version: '11'

- name: Setup JDK 17
id: setup-java-17
uses: actions/setup-java@v2.2.0
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '17.0.0'
distribution: 'temurin'
java-version: '17'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
if: failure()
with:
name: nightly-testOutOfBand-ci-jvm-err
path: '*_pid*.log'
path: '**/*_pid*.log'
if-no-files-found: ignore

- name: Publish Test Results
Expand Down
Loading

0 comments on commit 17170fd

Please sign in to comment.