Merge branch 'deephaven:main' into commit-hash-in-image

deephaven · Aug 15, 2024 · 2dc7223 · 2dc7223
2 parents 991330a + 7a3345e
commit 2dc7223
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
@@ -48,7 +48,7 @@ jobs:
           cat gradle.properties
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Assemble distribution
         run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble
@@ -102,7 +102,7 @@ jobs:
           cp artifacts/server/jetty-app/build/distributions/server-jetty-${{ steps.artifact_metadata.outputs.deephaven_version }}.tar contexts/server-slim/
 
       - name: Bake
-        uses: docker/bake-action@v5.6.1
+        uses: docker/bake-action@v5.7.0
         with:
           targets: ${{ github.event.inputs.bake_targets }}
           files: server.hcl,server-slim.hcl,server-base.hcl,server-slim-base.hcl

diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml
@@ -46,7 +46,7 @@ jobs:
           cat gradle.properties
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Assemble distribution
         run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble
@@ -103,7 +103,7 @@ jobs:
           cp artifacts/server/jetty-app/build/distributions/server-jetty-${{ steps.artifact_metadata.outputs.deephaven_version }}.tar contexts/server-slim/
 
       - name: Bake
-        uses: docker/bake-action@v5.6.1
+        uses: docker/bake-action@v5.7.0
         with:
           targets: server,server-slim,server-base,server-slim-base,server-ui
           files: server.hcl,server-slim.hcl,server-base.hcl,server-slim-base.hcl

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -30,7 +30,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Bake
-        uses: docker/bake-action@v5.6.1
+        uses: docker/bake-action@v5.7.0
         with:
           targets: server,server-slim,server-all-ai,server-nltk,server-pytorch,server-sklearn,server-tensorflow,server-ui
           files: server.hcl,server-slim.hcl

diff --git a/contexts/server-base/requirements.txt b/contexts/server-base/requirements.txt
@@ -4,7 +4,7 @@
 # These are dependencies of deephaven-core[autocomplete], not including deephaven-core.
 #
 # See https://github.com/deephaven/deephaven-core/blob/main/py/server/setup.py
-jpy>=0.17.0
+jpy>=0.18.0
 deephaven-plugin>=0.6.0
 numpy
 pandas>=1.5.0

diff --git a/contexts/server-base/type/server-all-ai/requirements.txt b/contexts/server-base/type/server-all-ai/requirements.txt
@@ -1,5 +1,5 @@
 # Note: this is targetted as the dependencies of deephaven-core, but not including deephaven-core
-jpy>=0.17.0
+jpy>=0.18.0
 deephaven-plugin>=0.5.0
 numpy
 pandas>=1.5.0