Skip to content

Commit eb5d034

Browse files
authored
Merge branch 'main' into valkeydependency
2 parents d7d65f0 + f88ba97 commit eb5d034

File tree

75 files changed

+1098
-745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1098
-745
lines changed

.github/dependabot.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
cooldown:
8+
# Apply 7 day cooldown to avoid updating dependencies right away. This reduces the opportunity window
9+
# when supply chain is compromised.
10+
default-days: 7
11+
- package-ecosystem: "maven"
12+
directory: "/"
13+
schedule:
14+
interval: "daily"
15+
open-pull-requests-limit: 10
16+
cooldown:
17+
# Apply 7 day cooldown to avoid updating dependencies right away. This reduces the opportunity window
18+
# when supply chain is compromised. This doesn't apply to the dependencies that we own and release.
19+
default-days: 7
20+
exclude:
21+
- io.airlift:*
22+
- io.trino:*
23+
ignore:
24+
# Airbase and Airlift are best updated together. Update Airbase only when updating Airlift.
25+
- dependency-name: "io.airlift:airbase"

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
java-version: [24]
27+
java-version: [25]
2828
timeout-minutes: 20
2929
steps:
3030
- name: Checkout source
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v6
3232
- name: Install required Java distribution
33-
uses: actions/setup-java@v4
33+
uses: actions/setup-java@v5
3434
with:
3535
java-version: ${{ matrix.java-version }}
3636
distribution: 'temurin'
@@ -42,6 +42,6 @@ jobs:
4242
- name: Build and Test Docker Image
4343
run: docker/build.sh
4444
- name: Set up Helm
45-
uses: azure/setup-helm@v4.2.0
45+
uses: azure/setup-helm@v4.3.1
4646
with:
4747
version: v3.12.1

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
deploy:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
13-
- uses: actions/setup-python@v5
12+
- uses: actions/checkout@v6
13+
- uses: actions/setup-python@v6
1414
with:
1515
python-version: 3.x
16-
- uses: actions/cache@v4
16+
- uses: actions/cache@v5
1717
with:
1818
key: ${{ github.ref }}
1919
path: .cache

.github/workflows/milestone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
- name: Get milestone from pom.xml
1919
run: |
2020
.github/bin/retry ./mvnw -v
2121
MILESTONE_NUMBER="$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout | cut -d- -f1)"
2222
echo "Setting PR milestone to ${MILESTONE_NUMBER}"
2323
echo "MILESTONE_NUMBER=${MILESTONE_NUMBER}" >> $GITHUB_ENV
2424
- name: Set milestone to PR
25-
uses: actions/github-script@v7
25+
uses: actions/github-script@v8
2626
with:
2727
github-token: ${{secrets.GITHUB_TOKEN}}
2828
script: |

.github/workflows/stale.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Stale PR tracking
2+
3+
on:
4+
schedule:
5+
- cron: '0 17 * * 1-5' # 9am UTC-8 on weekdays
6+
7+
permissions:
8+
pull-requests: write
9+
10+
jobs:
11+
stale:
12+
runs-on: ubuntu-latest
13+
if: github.repository == 'trinodb/trino-gateway'
14+
steps:
15+
- uses: actions/[email protected]
16+
with:
17+
stale-pr-message: 'This pull request has gone a while without any activity. Ask for help on #trino-gateway-dev on Trino slack.'
18+
days-before-pr-stale: 21
19+
days-before-pr-close: 21
20+
close-pr-message: 'Closing this pull request, as it has been stale for six weeks. Feel free to re-open at any time.'
21+
stale-pr-label: 'stale'
22+
exempt-pr-labels: 'stale-ignore'
23+
start-date: '2020-01-01T00:00:00Z'
24+
exempt-draft-pr: false
25+
operations-per-run: 200
26+
# Avoid processing issues completely, see https://github.com/actions/stale/issues/1112
27+
days-before-issue-stale: -1
28+
days-before-issue-close: -1

.java-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.0.2+12
1+
25.0.1+8

docker/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ARG TRINO_GATEWAY_BASE_IMAGE
1616
ARG TRINO_GATEWAY_BUILD_IMAGE
1717

18-
FROM ${TRINO_GATEWAY_BUILD_IMAGE} AS jdk-download
18+
FROM --platform=$BUILDPLATFORM ${TRINO_GATEWAY_BUILD_IMAGE} AS jdk-download
1919
ARG JDK_DOWNLOAD_LINK
2020
ARG JDK_RELEASE_NAME
2121
ENV JAVA_HOME="/usr/lib/jvm/jdk-${JDK_RELEASE_NAME}"
@@ -26,7 +26,9 @@ RUN \
2626
# Install JDK from the provided archive link \
2727
echo "Downloading JDK from ${JDK_DOWNLOAD_LINK}" && \
2828
mkdir -p "${JAVA_HOME}" && \
29-
curl -#LfS "${JDK_DOWNLOAD_LINK}" | tar -zx --strip 1 -C "${JAVA_HOME}"
29+
curl -#LfS --retry 8 "${JDK_DOWNLOAD_LINK}" -o /jdktarfile && \
30+
tar -zxf /jdktarfile --strip 1 -C "${JAVA_HOME}" && \
31+
echo "Done"
3032

3133
FROM ${TRINO_GATEWAY_BUILD_IMAGE} AS packages
3234

docker/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ TAG_PREFIX="trino-gateway:${TRINO_GATEWAY_VERSION}"
107107
#version file is used by the Helm chart test
108108
echo "${TRINO_GATEWAY_VERSION}" > "${SOURCE_DIR}"/trino-gateway-version.txt
109109

110-
TRINO_GATEWAY_BASE_IMAGE=${TRINO_GATEWAY_BASE_IMAGE:-'registry.access.redhat.com/ubi10/ubi-micro:latest'}
111-
TRINO_GATEWAY_BUILD_IMAGE=${TRINO_GATEWAY_BUILD_IMAGE:-'registry.access.redhat.com/ubi10/ubi:latest'}
110+
TRINO_GATEWAY_BASE_IMAGE=${TRINO_GATEWAY_BASE_IMAGE:-'redhat/ubi10-micro:latest'}
111+
TRINO_GATEWAY_BUILD_IMAGE=${TRINO_GATEWAY_BUILD_IMAGE:-'redhat/ubi10:latest'}
112112

113113
for arch in "${ARCHITECTURES[@]}"; do
114114
echo "🫙 Building the image for $arch with Temurin JDK release ${JDK_RELEASE_NAME}"

docs/development.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Build requirements
44

55
* Mac OS X or Linux
6-
* Java 24+, 64-bit
6+
* Java 25+, 64-bit
77
* Docker
88

99
#### Running Trino Gateway in your IDE
@@ -21,7 +21,7 @@ or execute the following command:
2121

2222
#### Locally
2323

24-
This project requires Java 24. Note that higher version of Java have not been
24+
This project requires Java 25. Note that higher version of Java have not been
2525
verified and may run into unexpected issues.
2626

2727
Run `./mvnw clean install` to build `trino-gateway`. VM options required for

docs/installation.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Consider the following requirements for your Trino Gateway installation.
2121

2222
### Java
2323

24-
Trino Gateway requires a Java 24 runtime. Older versions of Java can not be
24+
Trino Gateway requires a Java 25 runtime. Older versions of Java can not be
2525
used. Newer versions might work but are not tested.
2626

2727
Verify the Java version on your system with `java -version`.
@@ -401,8 +401,7 @@ it is marked as UNHEALTHY, and the Trino Gateway stops routing requests to it.
401401
It is important to distinguish TrinoStatus from the active/inactive
402402
state of a backend. The active/inactive state indicates whether a backend is
403403
manually turned on or off, whereas TrinoStatus is programmatically determined
404-
by the health check process. Health checks are only performed on backends
405-
that are marked as active.
404+
by the health check process.
406405

407406
See [TrinoStatus](routing-rules.md#trinostatus) for more details on
408407
what each Trino status means.

0 commit comments

Comments
 (0)