Skip to content

Commit b8e10f2

Browse files
authored
fix: Update java and gradle property setup (#143)
The workflow for setting up Java and Gradle properties was recently changed in deephaven-core, so we need to update the branch and edge workflows here in the same manner. deephaven/deephaven-core#7531 deephaven/deephaven-core#7532
1 parent 8ba965e commit b8e10f2

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed

.github/workflows/branch-ci.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
git-revision: ${{ steps.get-git-revision.outputs.GIT_REVISION }}
2121
steps:
2222
- name: Checkout deephaven-core
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
with:
2525
repository: deephaven/deephaven-core
2626
ref: ${{ github.event.inputs.deephaven_core_ref }}
@@ -29,23 +29,22 @@ jobs:
2929
id: get-git-revision
3030
run: echo "GIT_REVISION="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
3131

32-
- name: Setup JDK 11
33-
id: setup-java-11
34-
uses: actions/setup-java@v4
32+
- name: Setup JDKs
33+
uses: actions/setup-java@v5
3534
with:
3635
distribution: 'temurin'
37-
java-version: '11'
38-
39-
- name: Set JAVA_HOME
40-
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
36+
java-version: |
37+
11
38+
17
39+
21
4140
4241
- name: Setup gradle properties
4342
run: |
44-
.github/scripts/gradle-properties.sh >> gradle.properties
43+
.github/scripts/gradle-properties.sh 11 17 21 >> gradle.properties
4544
cat gradle.properties
4645
4746
- name: Setup Gradle
48-
uses: gradle/actions/setup-gradle@v4
47+
uses: gradle/actions/setup-gradle@v5
4948

5049
- name: Assemble distribution
5150
run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble
@@ -64,7 +63,7 @@ jobs:
6463
runs-on: ubuntu-24.04
6564
steps:
6665
- name: Checkout
67-
uses: actions/checkout@v4
66+
uses: actions/checkout@v5
6867

6968
- name: Set up QEMU
7069
uses: docker/setup-qemu-action@v3

.github/workflows/edge-ci.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,30 @@ jobs:
2323
git-revision: ${{ steps.get-git-revision.outputs.GIT_REVISION }}
2424
steps:
2525
- name: Checkout deephaven-core
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727
with:
2828
repository: deephaven/deephaven-core
2929

3030
- name: Get GIT Revision
3131
id: get-git-revision
3232
run: echo "GIT_REVISION="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
3333

34-
- name: Setup JDK 11
35-
id: setup-java-11
36-
uses: actions/setup-java@v4
34+
- name: Setup JDKs
35+
uses: actions/setup-java@v5
3736
with:
38-
distribution: "temurin"
39-
java-version: "11"
40-
41-
- name: Set JAVA_HOME
42-
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
37+
distribution: 'temurin'
38+
java-version: |
39+
11
40+
17
41+
21
4342
4443
- name: Setup gradle properties
4544
run: |
46-
.github/scripts/gradle-properties.sh >> gradle.properties
45+
.github/scripts/gradle-properties.sh 11 17 21 >> gradle.properties
4746
cat gradle.properties
4847
4948
- name: Setup Gradle
50-
uses: gradle/actions/setup-gradle@v4
49+
uses: gradle/actions/setup-gradle@v5
5150

5251
- name: Assemble distribution
5352
run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble
@@ -69,7 +68,7 @@ jobs:
6968
runs-on: ubuntu-24.04
7069
steps:
7170
- name: Checkout
72-
uses: actions/checkout@v4
71+
uses: actions/checkout@v5
7372

7473
- name: Set up QEMU
7574
uses: docker/setup-qemu-action@v3

0 commit comments

Comments
 (0)