From b5ef828a6901bfc874a9863124e8b187bb6e7801 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Sat, 16 Aug 2025 21:11:14 +1200 Subject: [PATCH 1/2] Update release configs --- release-process/distro-configs/centos10.json | 18 ++++++++++++++++++ release-process/distro-configs/debian13.json | 19 +++++++++++++++++++ .../distro-configs/ubuntu20-lts.json | 18 ------------------ .../{ubuntu24.10.json => ubuntu25.04.json} | 6 +++--- 4 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 release-process/distro-configs/centos10.json create mode 100644 release-process/distro-configs/debian13.json delete mode 100644 release-process/distro-configs/ubuntu20-lts.json rename release-process/distro-configs/{ubuntu24.10.json => ubuntu25.04.json} (82%) diff --git a/release-process/distro-configs/centos10.json b/release-process/distro-configs/centos10.json new file mode 100644 index 00000000000..0e48ecc3993 --- /dev/null +++ b/release-process/distro-configs/centos10.json @@ -0,0 +1,18 @@ +{ + "name": "CentOS Stream 10", + "ami_owner": "125523088429", + "ami_name_pattern": "CentOS Stream 10 *", + "user": "ec2-user", + "archs": ["x86_64", "arm64"], + "staticlibs": false, + "setup_commands": [ + "cloud-init status --wait", + "sudo dnf config-manager --set-enabled crb", + "sudo dnf install -y epel-release epel-next-release", + "sudo dnf update -y" + ], + "install_build_deps": "sudo dnf install -y rpm ccache cmake gcc gcc-c++ gdb lldb glibc-devel libstdc++-devel zlib-devel git python3 python3-pexpect rpm-build ninja-build capnproto capnproto-libs capnproto-devel libzstd libzstd-devel jq", + "install_build_deps_x86_64": "sudo dnf install -y glibc-devel.i686 libstdc++-devel.i686", + "install_app_test_deps": "sudo dnf install -y gtk3 dbus-glib xorg-x11-utils gnutls-devel libacl-devel openldap-devel tigervnc-server-minimal curl tar bzip2 libreoffice-writer", + "exclude_tests_arm64": ["when.*"] +} diff --git a/release-process/distro-configs/debian13.json b/release-process/distro-configs/debian13.json new file mode 100644 index 00000000000..8e08a924857 --- /dev/null +++ b/release-process/distro-configs/debian13.json @@ -0,0 +1,19 @@ +{ + "name": "Debian 13", + "ami_owner": "136693071363", + "ami_name_pattern": "debian-13-*", + "user": "admin", + "archs": ["x86_64", "arm64"], + "setup_commands": [ + "cloud-init status --wait", + "export DEBIAN_FRONTEND=noninteractive UCF_FORCE_CONFNEW=1", + "sudo -E apt-get update -y", + "sudo -E apt-get dist-upgrade -f -y" + ], + "install_build_deps": [ + "sudo -E apt-get install -y locales-all rpm ccache cmake g++ pkg-config zlib1g-dev git python-dev-is-python3 libacl1-dev ninja-build manpages-dev capnproto libcapnp-dev gdb lldb-16 python3-pexpect libzstd1 libzstd-dev jq", + "sudo update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-16 50" + ], + "install_build_deps_x86_64": "sudo -E apt-get install -y g++-multilib", + "install_app_test_deps": "sudo -E apt-get install -y tightvncserver xtightvncviewer curl tar bzip2 libdbus-glib-1-2 libreoffice" +} diff --git a/release-process/distro-configs/ubuntu20-lts.json b/release-process/distro-configs/ubuntu20-lts.json deleted file mode 100644 index f188997f6ff..00000000000 --- a/release-process/distro-configs/ubuntu20-lts.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Ubuntu 20.04 LTS", - "ami_owner": "099720109477", - "ami_name_pattern": "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-*", - "user": "ubuntu", - "setup_commands": [ - "cloud-init status --wait", - "sudo apt-get update -y", - "sudo apt-get dist-upgrade -f -y" - ], - "install_build_deps": [ - "sudo apt-get install -y rpm ccache cmake g++ pkg-config zlib1g-dev git python-dev libacl1-dev ninja-build manpages-dev capnproto libcapnp-dev gdb lldb-18 python3-pexpect libzstd1 libzstd-dev jq", - "sudo update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-18 50" - ], - "install_build_deps_x86_64": "sudo apt-get install -y g++-multilib", - "install_app_test_deps": "sudo apt-get install -y tightvncserver xtightvncviewer curl tar bzip2 libdbus-glib-1-2 libreoffice", - "exclude_tests": ["x86/pkeys.*"] -} diff --git a/release-process/distro-configs/ubuntu24.10.json b/release-process/distro-configs/ubuntu25.04.json similarity index 82% rename from release-process/distro-configs/ubuntu24.10.json rename to release-process/distro-configs/ubuntu25.04.json index ce3ef7fa6c1..b38a4aaded3 100644 --- a/release-process/distro-configs/ubuntu24.10.json +++ b/release-process/distro-configs/ubuntu25.04.json @@ -1,9 +1,9 @@ { - "name": "Ubuntu 24.10", + "name": "Ubuntu 25.04", "ami_owner": "099720109477", - "ami_name_pattern": "ubuntu/images/hvm-ssd-gp3/ubuntu-oracular-24.10-*", + "ami_name_pattern": "ubuntu/images/hvm-ssd-gp3/ubuntu-plucky-25.04-*", "user": "ubuntu", - "archs": ["x86_64"], + "archs": ["x86_64", "arm64"], "setup_commands": [ "cloud-init status --wait", "sudo apt-get update -y", From 009f4edce509df4e6ab7f655763311c13731c46f Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Sat, 16 Aug 2025 21:21:24 +1200 Subject: [PATCH 2/2] Bump version to 5.10.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0dcb45d2b8c..545bf7b4b74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ set(WILL_RUN_TESTS ${BUILD_TESTS} CACHE BOOL "Run tests") # debian is happy with it. However, "_" is illegal in debs, while RPM # is cool with it. Sigh. set(rr_VERSION_MAJOR 5) -set(rr_VERSION_MINOR 9) +set(rr_VERSION_MINOR 10) set(rr_VERSION_PATCH 0) if(ANDROID)