Skip to content

Commit 5183376

Browse files
authored
Merge branch 'main' into eric/fix_jemalloc_memory_profile
2 parents aa0fb2f + 3017aa2 commit 5183376

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

ci/scripts/common.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ export SCCACHE_REGION=us-east-2
1010
export SCCACHE_IDLE_TIMEOUT=0
1111
export CARGO_INCREMENTAL=0
1212
export CARGO_MAKE_PRINT_TIME_SUMMARY=true
13+
export MINIO_DOWNLOAD_BIN=https://ci-deps-dist.s3.amazonaws.com/minio
14+
export MCLI_DOWNLOAD_BIN=https://ci-deps-dist.s3.amazonaws.com/mc
15+
export GCLOUD_DOWNLOAD_TGZ=https://ci-deps-dist.s3.amazonaws.com/google-cloud-cli-406.0.0-linux-x86_64.tar.gz
1316
unset LANG
1417
if [ -n "${BUILDKITE_COMMIT:-}" ]; then
1518
export GIT_SHA=$BUILDKITE_COMMIT

ci/scripts/e2e-iceberg-sink-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ sleep 1
4141
# prepare minio iceberg sink
4242
echo "--- preparing iceberg"
4343
.risingwave/bin/mcli -C .risingwave/config/mcli mb hummock-minio/iceberg
44-
wget https://iceberg-ci-spark-dist.s3.amazonaws.com/spark-3.3.1-bin-hadoop3.tgz
44+
wget https://ci-deps-dist.s3.amazonaws.com/spark-3.3.1-bin-hadoop3.tgz
4545
tar -xf spark-3.3.1-bin-hadoop3.tgz --no-same-owner
4646
DEPENDENCIES=org.apache.iceberg:iceberg-spark-runtime-3.3_2.12:1.0.0,org.apache.hadoop:hadoop-aws:3.3.2
4747
spark-3.3.1-bin-hadoop3/bin/spark-sql --packages $DEPENDENCIES \

src/risedevtool/gcloud-pubsub.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ extend = "common.toml"
22

33
[env]
44
GCLOUD_DOWNLOAD_PATH = "${PREFIX_TMP}/gcloud.tgz"
5-
GCLOUD_VERSION = "406.0.0"
6-
GCLOUD_RELEASE = "google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz"
7-
GCLOUD_DOWNLOAD_TGZ = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${GCLOUD_RELEASE}"
5+
GCLOUD_DOWNLOAD_TGZ = { value = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-406.0.0-linux-x86_64.tar.gz", condition = { env_not_set = [ "GCLOUD_DOWNLOAD_TGZ" ] } }
86
GCLOUD_SDK_DIR = "google-cloud-sdk"
97

108
[tasks.download-pubsub]
@@ -19,7 +17,7 @@ set -e
1917
if [ -d "${PREFIX_BIN}/gcloud" ]; then
2018
exit 0
2119
fi
22-
echo "gcloud not found, download ${GCLOUD_RELEASE}"
20+
echo "gcloud not found, downloading"
2321
curl -fL -o "${GCLOUD_DOWNLOAD_PATH}" "${GCLOUD_DOWNLOAD_TGZ}"
2422
tar -xf "${GCLOUD_DOWNLOAD_PATH}" -C "${PREFIX_TMP}"
2523
echo "install the pubsub-emulator"

src/risedevtool/minio.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ extend = "common.toml"
22

33
[env]
44
MINIO_SYSTEM = "${SYSTEM}"
5-
MCLI_DOWNLOAD_BIN = "https://dl.min.io/client/mc/release/${MINIO_SYSTEM}/mc"
6-
MINIO_DOWNLOAD_BIN = "https://dl.min.io/server/minio/release/${MINIO_SYSTEM}/minio"
5+
MCLI_DOWNLOAD_BIN = { value = "https://dl.min.io/client/mc/release/${MINIO_SYSTEM}/mc", condition = { env_not_set = [ "MCLI_DOWNLOAD_BIN" ] } }
6+
MINIO_DOWNLOAD_BIN = { value = "https://dl.min.io/server/minio/release/${MINIO_SYSTEM}/minio", condition = { env_not_set = [ "MINIO_DOWNLOAD_BIN" ] } }
77

88
[tasks.download-minio]
99
private = true

0 commit comments

Comments
 (0)