diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml index 6c96a14a67f81..063944208519f 100644 --- a/ci/docker-compose.yml +++ b/ci/docker-compose.yml @@ -122,23 +122,23 @@ services: - ..:/risingwave release-env-x86: - # build binaries on a earlier Linux distribution (therefore with earlier version GLIBC) - # See https://github.com/risingwavelabs/risingwave/issues/4556 for more details. + # Build binaries on a earlier Linux distribution (therefore with earlier version GLIBC) + # `manylinux_2_28` is based on AlmaLinux 8 with GLIBC 2.28. # # GLIBC versions on some systems: - # Amazon Linux 2: 2.26 (EOL 2025-06-30) (We will definitely want to support this) - # AL2023: 2.34 - # Ubuntu 18.04: 2.27 (Already EOL 2023-05-31) - # Ubuntu 20.04: 2.31 + # - Amazon Linux 2023 (AL2023): 2.34 + # - Ubuntu 20.04: 2.31 # - # manylinux2014: CentOS 7 (EOL 2024-06-30), GLIBC 2.17 - image: quay.io/pypa/manylinux2014_x86_64 + # Systems that we don't provide support for: + # - Ubuntu 18.04: 2.27 (Already EOL 2023-05-31) + # - Amazon Linux 2: 2.26 (Originally EOL 2023-06-30, superseded by AL2023) + image: quay.io/pypa/manylinux_2_28_x86_64 working_dir: /mnt volumes: - ..:/mnt release-env-arm: - image: quay.io/pypa/manylinux2014_aarch64 + image: quay.io/pypa/manylinux_2_28_aarch64 working_dir: /mnt volumes: - ..:/mnt diff --git a/ci/scripts/release.sh b/ci/scripts/release.sh index 5a77be4f8bfb6..aaf52a777677a 100755 --- a/ci/scripts/release.sh +++ b/ci/scripts/release.sh @@ -16,18 +16,14 @@ curl "https://awscli.amazonaws.com/awscli-exe-linux-${ARCH}.zip" -o "awscliv2.zi unzip -q awscliv2.zip && ./aws/install && mv /usr/local/bin/aws /bin/aws echo "--- Install lld" -# The lld in the CentOS 7 repository is too old and contains a bug that causes a linker error. -# So we install a newer version here. (17.0.6, latest version at the time of writing) -# It is manually built in the same environent and uploaded to S3. -aws s3 cp s3://rw-ci-deps-dist/llvm-lld-manylinux2014_${ARCH}.tar.gz . -tar -zxvf llvm-lld-manylinux2014_${ARCH}.tar.gz --directory=/usr/local +dnf install -y lld ld.lld --version echo "--- Install dependencies for openssl" -yum install -y perl-core +dnf install -y perl-core echo "--- Install java and maven" -yum install -y java-11-openjdk java-11-openjdk-devel wget python3 python3-devel cyrus-sasl-devel +dnf install -y java-11-openjdk java-11-openjdk-devel wget python3 python3-devel cyrus-sasl-devel pip3 install toml-cli wget https://rw-ci-deps-dist.s3.amazonaws.com/apache-maven-3.9.3-bin.tar.gz && tar -zxvf apache-maven-3.9.3-bin.tar.gz export PATH="${REPO_ROOT}/apache-maven-3.9.3/bin:$PATH" @@ -91,7 +87,6 @@ if [[ -n "${BUILDKITE_TAG}" ]]; then ls -l echo "--- Install gh cli" - yum install -y dnf dnf install -y 'dnf-command(config-manager)' dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo dnf install -y gh @@ -123,7 +118,3 @@ if [[ -n "${BUILDKITE_TAG}" ]]; then tar -czvf risingwave-"${BUILDKITE_TAG}"-${ARCH}-unknown-linux-all-in-one.tar.gz risingwave libs gh release upload "${BUILDKITE_TAG}" risingwave-"${BUILDKITE_TAG}"-${ARCH}-unknown-linux-all-in-one.tar.gz fi - - - -