Skip to content

Commit

Permalink
Merge branch 'deephaven:main' into docs-ci-condition-on-latest-link
Browse files Browse the repository at this point in the history
  • Loading branch information
stanbrub authored Jan 6, 2025
2 parents 1776921 + 4d1af73 commit 32dffc6
Show file tree
Hide file tree
Showing 2,464 changed files with 108,279 additions and 296,812 deletions.
9 changes: 5 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
/TRIAGE.md @chipkent @rcaudy
/licenses @chipkent @rcaudy
/docker @devinrsmith @jcferretti @rcaudy
/engine/function/ @chipkent @kosak @rcaudy
/py @chipkent @jmao-denver @rcaudy
/R @chipkent @alexpeters1208 @rcaudy
*.proto @devinrsmith @nbauernfeind @niloc132 @rcaudy
/engine/function/ @chipkent @kosak @rcaudy @cpwright
/py @chipkent @jmao-denver @rcaudy @cpwright
/R @chipkent @rcaudy @cpwright
*.proto @devinrsmith @nbauernfeind @niloc132 @rcaudy @cpwright
*.gwt.xml @niloc132 @rcaudy @nbauernfeind @cpwright
24 changes: 24 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,29 @@ version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
open-pull-requests-limit: 99
schedule:
interval: "weekly"
commit-message:
prefix: "chore(github-actions)"
labels:
- "NoDocumentationNeeded"
- "NoReleaseNotesNeeded"
- "version-bump"
assignees:
- "devinrsmith"
- "stanbrub"
- package-ecosystem: "gradle"
directory: "/"
open-pull-requests-limit: 99
schedule:
interval: "weekly"
commit-message:
prefix: "chore(gradle)"
labels:
- "NoDocumentationNeeded"
- "NoReleaseNotesNeeded"
- "version-bump"
assignees:
- "devinrsmith"
- "rcaudy"
4 changes: 4 additions & 0 deletions .github/scripts/gradle-properties.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_20_X64:+$JAVA_HOME_20_X64,}
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_21_X64:+$JAVA_HOME_21_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_22_X64:+$JAVA_HOME_22_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_23_X64:+$JAVA_HOME_23_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_24_X64:+$JAVA_HOME_24_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_25_X64:+$JAVA_HOME_25_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_26_X64:+$JAVA_HOME_26_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_27_X64:+$JAVA_HOME_27_X64,}"

# Our CI JDKs should be pre-provisioned and invoked correctly,
# we shouldn't rely on gradle for any of this logic.
Expand Down
24 changes: 11 additions & 13 deletions .github/workflows/build-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
distribution: 'temurin'
java-version: '17'

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

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

Expand Down Expand Up @@ -88,11 +91,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Create Dockerfile and context
uses: burrunan/gradle-cache-action@v1
with:
job-id: build-server
arguments: --scan outputVersion docker-server-slim:prepareDocker docker-server:prepareDockerAll
gradle-version: wrapper
run: ./gradlew --scan outputVersion docker-server-slim:prepareDocker docker-server:prepareDockerAll

- name: Get Deephaven Version
id: deephaven_version
Expand All @@ -103,7 +102,7 @@ jobs:
# https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#github-cache
# https://github.com/docker/buildx/pull/535
- name: Docker build server
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
build-args: |
BASE=deephaven/server-base:local-build
Expand All @@ -116,7 +115,7 @@ jobs:

# Note: server-slim does not need BASE/SERVER build-args like the other server images
- name: Docker build server slim
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
build-args: |
DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
Expand Down Expand Up @@ -158,6 +157,9 @@ jobs:
distribution: 'temurin'
java-version: '11'

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

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

Expand All @@ -182,19 +184,15 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Create Dockerfile and context
uses: burrunan/gradle-cache-action@v1
with:
job-id: build-web
arguments: --scan outputVersion docker-web-plugin-packager:prepareDocker
gradle-version: wrapper
run: ./gradlew --scan outputVersion docker-web-plugin-packager:prepareDocker

- name: Get Deephaven Version
id: deephaven_version
run: |
echo "deephaven_version=$(cat build/version)" >> $GITHUB_OUTPUT
- name: Docker build
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
build-args: |
DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/check-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:
distribution: 'temurin'
java-version: '17'

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

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

Expand All @@ -42,11 +45,7 @@ jobs:
cat gradle.properties
- name: Check
uses: burrunan/gradle-cache-action@v1
with:
job-id: checks
arguments: --scan --continue check
gradle-version: wrapper
run: ./gradlew --scan --continue check

- name: Upload Test Results
uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- name: "CLA Assistant"
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
uses: cla-assistant/github-action@v2.4.0
uses: cla-assistant/github-action@v2.6.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_PERSONAL_ACCESS_TOKEN }}
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/conventional-pr-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: 'Conventional PR'

on:
pull_request_target:
types:
- opened
- edited
- synchronize

jobs:
pr-check:
runs-on: ubuntu-22.04
steps:
- uses: amannn/action-semantic-pull-request@v5
id: lint_pr_title
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: marocchino/sticky-pull-request-comment@v2
# When the previous steps fails, the workflow would stop. By adding this
# condition you can continue the execution with the populated error message.
if: always() && (steps.lint_pr_title.outputs.error_message != null)
with:
header: pr-title-lint-error
message: |
Pull Request titles must follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/).
Breaking changes that are expected to impact users must include "BREAKING CHANGE: <description>" at the end of the PR description.
Details:
```
${{ steps.lint_pr_title.outputs.error_message }}
```
# Delete a previous comment when the issue has been resolved
- if: ${{ steps.lint_pr_title.outputs.error_message == null }}
uses: marocchino/sticky-pull-request-comment@v2
with:
header: pr-title-lint-error
delete: true
2 changes: 1 addition & 1 deletion .github/workflows/create-docs-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
await script({github, context});
- name: Slack Failure Message
uses: slackapi/slack-github-action@v1.26.0
uses: slackapi/slack-github-action@v1.27.0
id: slack-failure-message
if: failure() && github.ref == 'refs/heads/main' && github.repository_owner == 'deephaven'
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-submission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
cat gradle.properties
- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v3
uses: gradle/actions/dependency-submission@v4
env:
# Dependencies derived from :server-jetty-app runtimeClasspath get a "runtime" scope and everything else gets
# a "development" scope. Ideally, gradle would be able to pass along the finer dependency details (for
Expand Down
Loading

0 comments on commit 32dffc6

Please sign in to comment.