Skip to content

fix: Update java and gradle property setup #143

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.

Sign up for GitHub

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

Merged
devinrsmith merged 1 commit into from
Jan 5, 2026
Merged

fix: Update java and gradle property setup #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions .github/workflows/branch-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
git-revision: ${{ steps.get-git-revision.outputs.GIT_REVISION }}
steps:
- name: Checkout deephaven-core
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: deephaven/deephaven-core
ref: ${{ github.event.inputs.deephaven_core_ref }}
Expand All @@ -29,23 +29,22 @@ jobs:
id: get-git-revision
run: echo "GIT_REVISION="$(git rev-parse HEAD) >> $GITHUB_OUTPUT

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v4
- name: Setup JDKs
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '11'

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
java-version: |
11
17
21

- name: Setup gradle properties
run: |
.github/scripts/gradle-properties.sh >> gradle.properties
.github/scripts/gradle-properties.sh 11 17 21 >> gradle.properties
cat gradle.properties

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v5

- name: Assemble distribution
run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble
Expand All @@ -64,7 +63,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down
23 changes: 11 additions & 12 deletions .github/workflows/edge-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,30 @@ jobs:
git-revision: ${{ steps.get-git-revision.outputs.GIT_REVISION }}
steps:
- name: Checkout deephaven-core
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: deephaven/deephaven-core

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

- name: Setup JDK 11
id: setup-java-11
uses: actions/setup-java@v4
- name: Setup JDKs
uses: actions/setup-java@v5
with:
distribution: "temurin"
java-version: "11"

- name: Set JAVA_HOME
run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
distribution: 'temurin'
java-version: |
11
17
21

- name: Setup gradle properties
run: |
.github/scripts/gradle-properties.sh >> gradle.properties
.github/scripts/gradle-properties.sh 11 17 21 >> gradle.properties
cat gradle.properties

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v5

- name: Assemble distribution
run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble
Expand All @@ -69,7 +68,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Expand Down