Skip to content

Commit 8772759

Browse files
authored
Merge pull request #4536 from esl/ubuntu-plucky
Replace Ubuntu Oracular with Plucky Oracular will end its support in July 2025. Plucky is the current interim release, and we support only one interim release. See https://ubuntu.com/about/release-cycle for details Also: get the debsigs package from Plucky, not from Oracular. Motivation: Plucky is the current release, and Oracular might disappear from the repos. Also, tested the packages by temporarily enabling building them for this branch, see the CI pipeline. I didn't rerun the flaky tests, because the check was only for packages.
2 parents 977a18c + 11442a2 commit 8772759

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.circleci/template.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ jobs:
690690
type: executor
691691
platform:
692692
type: enum
693-
enum: [debian-bookworm, debian-bullseye, debian-buster, ubuntu-oracular, ubuntu-noble, ubuntu-jammy, ubuntu-focal, rockylinux-9, rockylinux-8, almalinux-9, almalinux-8]
693+
enum: [debian-bookworm, debian-bullseye, debian-buster, ubuntu-plucky, ubuntu-noble, ubuntu-jammy, ubuntu-focal, rockylinux-9, rockylinux-8, almalinux-9, almalinux-8]
694694
description: Platform type
695695
otp_version:
696696
type: string
@@ -742,7 +742,7 @@ workflows:
742742
filters: &release_tags
743743
tags:
744744
only: /^\d+\.\d+\.\d+/
745-
# # ============= PACKAGES =============
745+
# ============= PACKAGES =============
746746
- package:
747747
name: debian-bookworm
748748
executor: otp_27
@@ -780,15 +780,15 @@ workflows:
780780
context: mongooseim-org
781781
filters: *all_tags_and_master
782782
- package:
783-
name: ubuntu-oracular
783+
name: ubuntu-plucky
784784
executor: otp_27
785-
platform: ubuntu-oracular
785+
platform: ubuntu-plucky
786786
context: mongooseim-org
787787
filters: *all_tags_and_master
788788
- package:
789-
name: ubuntu-oracular-arm64
789+
name: ubuntu-plucky-arm64
790790
executor: otp_27_arm64
791-
platform: ubuntu-oracular
791+
platform: ubuntu-plucky
792792
context: mongooseim-org
793793
filters: *all_tags_and_master
794794
- package:

tools/pkg/Dockerfile_deb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ RUN arch=$(dpkg --print-architecture) && \
1717
distro=$(grep ^ID= /etc/os-release | cut -d= -f2 | tr -d '"') && \
1818
if [ "$distro" = "ubuntu" ]; then \
1919
if [ "$arch" = "arm64" ]; then \
20-
echo "deb http://ports.ubuntu.com/ubuntu-ports oracular main restricted universe multiverse" >> /etc/apt/sources.list; \
20+
echo "deb http://ports.ubuntu.com/ubuntu-ports plucky main restricted universe multiverse" >> /etc/apt/sources.list; \
2121
else \
22-
echo "deb http://archive.ubuntu.com/ubuntu oracular main restricted universe multiverse" >> /etc/apt/sources.list; \
22+
echo "deb http://archive.ubuntu.com/ubuntu plucky main restricted universe multiverse" >> /etc/apt/sources.list; \
2323
fi && \
24-
printf "Package: debsigs\nPin: release n=oracular\nPin-Priority: 990\n" > /etc/apt/preferences.d/debsigs; \
24+
printf "Package: debsigs\nPin: release n=plucky\nPin-Priority: 990\n" > /etc/apt/preferences.d/debsigs; \
2525
elif [ "$distro" = "debian" ]; then \
2626
echo "deb http://deb.debian.org/debian trixie main" >> /etc/apt/sources.list && \
2727
printf "Package: debsigs\nPin: release n=trixie\nPin-Priority: 990\n" > /etc/apt/preferences.d/debsigs; \
2828
fi && \
2929
apt-get update && \
3030
apt-get install -y --no-install-recommends debsigs && \
31-
sed -i '/oracular/d' /etc/apt/sources.list && \
31+
sed -i '/plucky/d' /etc/apt/sources.list && \
3232
sed -i '/trixie/d' /etc/apt/sources.list
3333

3434
ARG erlang_version

0 commit comments

Comments
 (0)