Skip to content

GH-45479: [CI][Release] Use Ubuntu 24.04 instead of 20.04 #45480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 1 commit into from
Feb 10, 2025
Merged

GH-45479: [CI][Release] Use Ubuntu 24.04 instead of 20.04 #45480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions ci/docker/ubuntu-20.04-verify-rc.dockerfile
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions dev/release/setup-ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ version=$(. /etc/os-release && echo ${VERSION_ID})

apt-get update -y -q

if [ ${version} \> "20.04" ]; then
apt-get install -y -q --no-install-recommends \
libxsimd-dev
fi

if [ ${version} \> "22.04" ]; then
# Some tests rely on legacy timezone aliases such as "US/Pacific"
apt-get install -y -q --no-install-recommends \
Expand All @@ -50,6 +45,7 @@ apt-get install -y -q --no-install-recommends \
libglib2.0-dev \
libsqlite3-dev \
libssl-dev \
libxsimd-dev \
llvm-dev \
ninja-build \
nlohmann-json3-dev \
Expand Down
12 changes: 2 additions & 10 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,17 +730,14 @@ tasks:

{% for distribution, version in [("conda", "latest"),
("almalinux", "8"),
("ubuntu", "20.04"),
("ubuntu", "22.04")] %}
("ubuntu", "22.04"),
("ubuntu", "24.04")] %}
{% for target in ["cpp",
"csharp",
"integration",
"js",
"python",
"ruby"] %}
# Skip verification for python and integration on Ubuntu 20.04
# GH-44253. Remove once we drop support for 20.04
{% if not (target in ["python", "integration"] and version == "20.04") %}
verify-rc-source-{{ target }}-linux-{{ distribution }}-{{ version }}-amd64:
ci: github
template: verify-rc/github.linux.amd64.docker.yml
Expand All @@ -749,20 +746,15 @@ tasks:
{{ distribution.upper() }}: "{{ version }}"
target: {{ target }}
distro: {{ distribution }}
{% endif %}
{% endfor %}

{% for target in ["jars", "wheels"] %}
# Skip verification for wheels on Ubuntu 20.04
# GH-44253. Remove once we drop support for 20.04
{% if not (target == "wheels" and version == "20.04") %}
verify-rc-binaries-{{ target }}-linux-{{ distribution }}-{{ version }}-amd64:
ci: github
template: verify-rc/github.linux.amd64.docker.yml
params:
target: {{ target }}
distro: {{ distribution }}
{% endif %}
{% endfor %}

{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2025,7 +2025,7 @@ services:
# docker compose build ubuntu-verify-rc
# docker compose run -e VERIFY_VERSION=6.0.1 -e VERIFY_RC=1 ubuntu-verify-rc
# Parameters:
# UBUNTU: 20.04, 22.04
# UBUNTU: 22.04, 24.04
image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-verify-rc
build:
context: .
Expand Down
Loading