Skip to content

Commit 53c404c

Browse files
authored
GH-45479: [CI][Release] Use Ubuntu 24.04 instead of 20.04 (#45480)
### Rationale for this change Ubuntu 20.04 will reach EOL on 2025-05. ### What changes are included in this PR? * Remove Ubuntu 20.04 * Add Ubuntu 24.04 ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #45479 Authored-by: Sutou Kouhei <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent c8a7def commit 53c404c

File tree

4 files changed

+4
-42
lines changed

4 files changed

+4
-42
lines changed

ci/docker/ubuntu-20.04-verify-rc.dockerfile

Lines changed: 0 additions & 26 deletions
This file was deleted.

dev/release/setup-ubuntu.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ version=$(. /etc/os-release && echo ${VERSION_ID})
2626

2727
apt-get update -y -q
2828

29-
if [ ${version} \> "20.04" ]; then
30-
apt-get install -y -q --no-install-recommends \
31-
libxsimd-dev
32-
fi
33-
3429
if [ ${version} \> "22.04" ]; then
3530
# Some tests rely on legacy timezone aliases such as "US/Pacific"
3631
apt-get install -y -q --no-install-recommends \
@@ -50,6 +45,7 @@ apt-get install -y -q --no-install-recommends \
5045
libglib2.0-dev \
5146
libsqlite3-dev \
5247
libssl-dev \
48+
libxsimd-dev \
5349
llvm-dev \
5450
ninja-build \
5551
nlohmann-json3-dev \

dev/tasks/tasks.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -730,17 +730,14 @@ tasks:
730730

731731
{% for distribution, version in [("conda", "latest"),
732732
("almalinux", "8"),
733-
("ubuntu", "20.04"),
734-
("ubuntu", "22.04")] %}
733+
("ubuntu", "22.04"),
734+
("ubuntu", "24.04")] %}
735735
{% for target in ["cpp",
736736
"csharp",
737737
"integration",
738738
"js",
739739
"python",
740740
"ruby"] %}
741-
# Skip verification for python and integration on Ubuntu 20.04
742-
# GH-44253. Remove once we drop support for 20.04
743-
{% if not (target in ["python", "integration"] and version == "20.04") %}
744741
verify-rc-source-{{ target }}-linux-{{ distribution }}-{{ version }}-amd64:
745742
ci: github
746743
template: verify-rc/github.linux.amd64.docker.yml
@@ -749,20 +746,15 @@ tasks:
749746
{{ distribution.upper() }}: "{{ version }}"
750747
target: {{ target }}
751748
distro: {{ distribution }}
752-
{% endif %}
753749
{% endfor %}
754750

755751
{% for target in ["jars", "wheels"] %}
756-
# Skip verification for wheels on Ubuntu 20.04
757-
# GH-44253. Remove once we drop support for 20.04
758-
{% if not (target == "wheels" and version == "20.04") %}
759752
verify-rc-binaries-{{ target }}-linux-{{ distribution }}-{{ version }}-amd64:
760753
ci: github
761754
template: verify-rc/github.linux.amd64.docker.yml
762755
params:
763756
target: {{ target }}
764757
distro: {{ distribution }}
765-
{% endif %}
766758
{% endfor %}
767759

768760
{% endfor %}

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2025,7 +2025,7 @@ services:
20252025
# docker compose build ubuntu-verify-rc
20262026
# docker compose run -e VERIFY_VERSION=6.0.1 -e VERIFY_RC=1 ubuntu-verify-rc
20272027
# Parameters:
2028-
# UBUNTU: 20.04, 22.04
2028+
# UBUNTU: 22.04, 24.04
20292029
image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-verify-rc
20302030
build:
20312031
context: .

0 commit comments

Comments
 (0)