Skip to content

Commit 57020be

Browse files
xeniapexeniape
authored
Merge branch 'main' into chore/update-tools-for-25.11.0
2 parents 8a2c510 + e13fe70 commit 57020be

17 files changed

Lines changed: 127 additions & 85 deletions

.github/workflows/boil_build_release.yaml renamed to .github/workflows/boil_pr.yaml

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
---
2-
name: Build/Release boil
2+
name: Build boil
33

44
on:
55
pull_request:
66
paths:
7-
- '.github/workflows/boil_build_release.yaml'
8-
- 'rust-toolchain.toml'
9-
- 'Cargo.*'
10-
- '**.rs'
11-
push:
12-
tags:
13-
- "boil-[0-9]+.[0-9]+.[0-9]+**"
7+
- ".github/workflows/boil_pr.yaml"
8+
- "rust-toolchain.toml"
9+
- "rust/boil/**.rs"
10+
- "Cargo.*"
1411

1512
env:
1613
RUST_VERSION: 1.87.0
@@ -39,18 +36,6 @@ jobs:
3936
with:
4037
command: check ${{ matrix.checks }}
4138

42-
create-release:
43-
name: Create Draft Release
44-
if: github.event_name == 'push'
45-
needs:
46-
- cargo-deny
47-
runs-on: ubuntu-latest
48-
steps:
49-
- name: Create Draft Release
50-
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
51-
with:
52-
draft: true
53-
5439
build:
5540
name: Build boil
5641
needs:
@@ -59,9 +44,9 @@ jobs:
5944
fail-fast: false
6045
matrix:
6146
targets:
62-
- {target: aarch64-unknown-linux-gnu, os: ubuntu-24.04-arm}
63-
- {target: x86_64-unknown-linux-gnu, os: ubuntu-latest}
64-
- {target: aarch64-apple-darwin, os: macos-latest}
47+
- { target: aarch64-unknown-linux-gnu, os: ubuntu-24.04-arm }
48+
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest }
49+
- { target: aarch64-apple-darwin, os: macos-latest }
6550
runs-on: ${{ matrix.targets.os }}
6651
steps:
6752
- name: Checkout
@@ -77,16 +62,4 @@ jobs:
7762
- name: Build Binary
7863
env:
7964
TARGET: ${{ matrix.targets.target }}
80-
run: cargo build --target "$TARGET" --release --package boil
81-
82-
- name: Rename Binary
83-
env:
84-
TARGET: ${{ matrix.targets.target }}
85-
run: mv "target/$TARGET/release/boil" "boil-$TARGET"
86-
87-
- name: Upload Artifact to Release
88-
if: github.event_name == 'push'
89-
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
90-
with:
91-
draft: false
92-
files: boil-${{ matrix.targets.target }}
65+
run: cargo build --target "$TARGET" --package boil

‎.github/workflows/boil_release.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
---
2+
name: Release boil
3+
4+
on:
5+
push:
6+
tags:
7+
- "boil-[0-9]+.[0-9]+.[0-9]+**"
8+
9+
env:
10+
RUST_VERSION: 1.87.0
11+
12+
jobs:
13+
create-release:
14+
name: Create Draft Release
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Create Draft Release
18+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
19+
with:
20+
draft: true
21+
22+
build:
23+
name: Build boil
24+
needs:
25+
- create-release
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
targets:
30+
- { target: aarch64-unknown-linux-gnu, os: ubuntu-24.04-arm }
31+
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest }
32+
- { target: aarch64-apple-darwin, os: macos-latest }
33+
runs-on: ${{ matrix.targets.os }}
34+
steps:
35+
- name: Checkout
36+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
37+
with:
38+
persist-credentials: false
39+
40+
- uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9
41+
with:
42+
toolchain: ${{ env.RUST_VERSION }}
43+
targets: ${{ matrix.targets.target }}
44+
45+
- name: Build Binary
46+
env:
47+
TARGET: ${{ matrix.targets.target }}
48+
run: cargo build --target "$TARGET" --release --package boil
49+
50+
- name: Rename Binary
51+
env:
52+
TARGET: ${{ matrix.targets.target }}
53+
run: mv "target/$TARGET/release/boil" "boil-$TARGET"
54+
55+
- name: Upload Artifact to Release
56+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
57+
with:
58+
draft: false
59+
files: boil-${{ matrix.targets.target }}

‎.yamllint.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ rules:
1111
comments:
1212
min-spaces-from-content: 1 # Needed due to https://github.com/adrienverge/yamllint/issues/443
1313
indentation: disable
14+
braces:
15+
max-spaces-inside: 1
16+
max-spaces-inside-empty: 0

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
2323
- superset: Add `4.1.4` ([#1284]).
2424
- spark: Add `4.0.1` ([#1286]).
2525
- spark-connect-client: Add `4.0.1` ([#1286]).
26+
- trino/trino-storage-connector: Add `477` ([#1285]).
2627

2728
### Changed
2829

@@ -35,6 +36,7 @@ All notable changes to this project will be documented in this file.
3536
- airflow: Bump uvicorn dependency to `0.37.0` ([#1264]).
3637
- druid: Deprecate `33.0.0` ([#1263]).
3738
- opa: Deprecate `1.4.2` ([#1279]).
39+
- trino-cli: Bump to 477 ([#1285]).
3840

3941
### Removed
4042

@@ -48,6 +50,7 @@ All notable changes to this project will be documented in this file.
4850
- kafka: Remove `3.9.0` ([#1283]).
4951
- spark: Remove `4.0.0` ([#1286]).
5052
- spark-connect-client: Remove `4.0.0` ([#1286]).
53+
- trino/trino-storage-conector: Remove `470` ([#1285]).
5154

5255
[#1207]: https://github.com/stackabletech/docker-images/pull/1207
5356
[#1215]: https://github.com/stackabletech/docker-images/pull/1215
@@ -70,6 +73,7 @@ All notable changes to this project will be documented in this file.
7073
[#1283]: https://github.com/stackabletech/docker-images/pull/1283
7174
[#1280]: https://github.com/stackabletech/docker-images/pull/1280
7275
[#1284]: https://github.com/stackabletech/docker-images/pull/1284
76+
[#1285]: https://github.com/stackabletech/docker-images/pull/1285
7377
[#1286]: https://github.com/stackabletech/docker-images/pull/1286
7478

7579
## [25.7.0] - 2025-07-23

‎rust/boil/src/build/cli.rs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub struct BuildArguments {
4747
/// The format is host[:port].
4848
#[arg(
4949
short, long,
50-
default_value_t = HostPort::localhost(),
50+
default_value_t = Self::default_registry(),
5151
value_hint = ValueHint::Hostname,
5252
help_heading = "Registry Options"
5353
)]
@@ -125,6 +125,13 @@ impl BuildArguments {
125125
"0.0.0-dev".parse().expect("must be a valid SemVer")
126126
}
127127

128+
fn default_registry() -> HostPort {
129+
HostPort {
130+
host: Host::Domain(String::from("oci.stackable.tech")),
131+
port: None,
132+
}
133+
}
134+
128135
// TODO: Auto-detect this
129136
fn default_architecture() -> TargetPlatform {
130137
TargetPlatform::Linux(Architecture::Amd64)

‎rust/patchable/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ cargo patchable checkout druid 26.0.0
135135

136136
# Tell Patchable about the new version 28.0.0, which can be fetched from
137137
# https://github.com/apache/druid.git, and has the tag druid-28.0.0
138-
cargo patchable init druid 28.0.0 --upstream https://github.com/apache/druid.git --base druid-28.0.0
138+
cargo patchable init version druid 28.0.0 --upstream https://github.com/apache/druid.git --base druid-28.0.0
139139

140140
# Create and go to the worktree for the new version
141141
pushd $(cargo patchable checkout druid 28.0.0)

‎trino-cli/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ COPY --chown=${STACKABLE_USER_UID}:0 trino-cli/licenses /licenses
2929
WORKDIR /stackable/trino-cli
3030

3131
RUN <<EOF
32-
curl -O "https://repo.stackable.tech/repository/packages/trino-cli/trino-cli-${PRODUCT_VERSION}-executable.jar"
33-
ln -s "trino-cli-${PRODUCT_VERSION}-executable.jar" trino-cli-executable.jar
32+
curl -O "https://repo.stackable.tech/repository/packages/trino-cli/trino-cli-${PRODUCT_VERSION}"
33+
chmod +x "trino-cli-${PRODUCT_VERSION}"
34+
ln -s "trino-cli-${PRODUCT_VERSION}" trino-cli
3435

3536
# All files and folders owned by root group to support running as arbitrary users.
3637
# This is best practice as all container users will belong to the root group (0).
@@ -46,4 +47,4 @@ EOF
4647
# ----------------------------------------
4748

4849
USER ${STACKABLE_USER_UID}
49-
ENTRYPOINT ["java", "-jar", "/stackable/trino-cli/trino-cli-executable.jar"]
50+
ENTRYPOINT ["/stackable/trino-cli/trino-cli"]

‎trino-cli/boil-config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
[versions."476".local-images]
1+
[versions."477".local-images]
22
java-base = "24"

‎trino-cli/upload_new_trino_version.sh‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,16 @@ trap cleanup EXIT
3131

3232
cd "$WORK_DIR" || exit
3333

34-
bin_file=trino-cli-${VERSION}-executable.jar
35-
36-
echo "Downloading Trino (this can take a while, it is intentionally downloading from a slow mirror that contains all old versions)"
37-
curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}"
38-
curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}.asc"
39-
curl --fail -LO --progress-bar "https://repo1.maven.org/maven2/io/trino/trino-cli/${VERSION}/${bin_file}.sha1"
40-
41-
# It is probably redundant to check both the checksum and the signature but it's cheap and why not
42-
echo "Validating SHA1 Checksum"
43-
if ! (sha1sum "${bin_file}" | cut -d " " -f 1 | diff -Z - "${bin_file}.sha1"); then
44-
echo "ERROR: The SHA1 sum does not match"
45-
exit 1
46-
fi
34+
echo "Downloading Trino"
35+
# Since Trino version 477, the CLI is only available as a GitHub release and not on Maven repository anymore.
36+
curl --fail -LO --progress-bar "https://github.com/trinodb/trino/releases/download/${VERSION}/trino-cli-${VERSION}"
37+
38+
# The GitHub releases don't provide SHA1 checksums. That's why we currently don't validate the checksum.
39+
# echo "Validating SHA1 Checksum"
40+
# if ! (sha1sum "${bin_file}" | cut -d " " -f 1 | diff -Z - "${bin_file}.sha1"); then
41+
# echo "ERROR: The SHA1 sum does not match"
42+
# exit 1
43+
# fi
4744

4845
# echo "Adding pinned public key for signature"
4946
# # We lock the public key here until trino has a better workflow for signing
@@ -89,9 +86,7 @@ fi
8986

9087
echo "Uploading everything to Nexus"
9188
EXIT_STATUS=0
92-
curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "${bin_file}" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
93-
curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "${bin_file}.asc" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
94-
curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "${bin_file}.sha1" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
89+
curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" --upload-file "trino-cli-${VERSION}" 'https://repo.stackable.tech/repository/packages/trino-cli/' || EXIT_STATUS=$?
9590

9691
if [ $EXIT_STATUS -ne 0 ]; then
9792
echo "ERROR: Upload failed"

‎trino/boil-config.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ java-base = "22"
66
[versions."451".build-arguments]
77
jmx-exporter-version = "1.3.0"
88

9-
[versions."470".local-images]
10-
java-base = "23"
11-
"trino/trino" = "470"
12-
"trino/storage-connector" = "470"
13-
14-
[versions."470".build-arguments]
15-
jmx-exporter-version = "1.3.0"
16-
179
[versions."476".local-images]
1810
java-base = "24"
1911
"trino/trino" = "476"
2012
"trino/storage-connector" = "476"
2113

2214
[versions."476".build-arguments]
2315
jmx-exporter-version = "1.3.0"
16+
17+
[versions."477".local-images]
18+
java-base = "24"
19+
"trino/trino" = "477"
20+
"trino/storage-connector" = "477"
21+
22+
[versions."477".build-arguments]
23+
jmx-exporter-version = "1.3.0"

0 commit comments

Comments
 (0)