From b3d1413c9405def45dd804c359fbca68fe68c621 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sun, 8 Dec 2024 21:42:20 -0600 Subject: [PATCH 1/9] Add a gcc 15 job --- dev/tasks/tasks.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index c8c311f5137df..e3927f01e29d4 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -962,6 +962,18 @@ tasks: flags: -e CC=gcc-14 -e CXX=g++-14 -e RapidJSON_SOURCE=BUNDLED image: ubuntu-cpp + test-ubuntu-24.04-cpp-gcc-15: + ci: github + template: docker-tests/github.linux.yml + params: + env: + CLANG_TOOLS: 15 + GCC_VERSION: 15 + LLVM: 15 + UBUNTU: 24.04 + flags: -e CC=gcc-15 -e CXX=g++-15 -e RapidJSON_SOURCE=BUNDLED + image: ubuntu-cpp + test-skyhook-integration: ci: github template: docker-tests/github.linux.yml From bd4d5413a6a139c470d17ebd95a0047ce7bbafe9 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sun, 8 Dec 2024 22:13:07 -0600 Subject: [PATCH 2/9] try snapshot --- ci/docker/ubuntu-24.04-cpp.dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile b/ci/docker/ubuntu-24.04-cpp.dockerfile index f662edc5365bc..339f3004e0cab 100644 --- a/ci/docker/ubuntu-24.04-cpp.dockerfile +++ b/ci/docker/ubuntu-24.04-cpp.dockerfile @@ -141,9 +141,15 @@ RUN if [ "${gcc_version}" = "" ]; then \ add-apt-repository ppa:ubuntu-toolchain-r/volatile; \ fi; \ apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ + if [ "${gcc_version}" -gt "14" ]; then \ + apt-get install -y -q --no-install-recommends \ + g++-snapshot \ + gcc-snapshot; \ + else \ + apt-get install -y -q --no-install-recommends \ g++-${gcc_version} \ - gcc-${gcc_version} && \ + gcc-${gcc_version}; \ + fi; \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${gcc_version} 100 && \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${gcc_version} 100 && \ update-alternatives --install \ From a3d5e630eb2f6b3614f4b29193b05487e26e7c1f Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sun, 8 Dec 2024 22:23:04 -0600 Subject: [PATCH 3/9] no g++ snapshot --- ci/docker/ubuntu-24.04-cpp.dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile b/ci/docker/ubuntu-24.04-cpp.dockerfile index 339f3004e0cab..1c90309b298f4 100644 --- a/ci/docker/ubuntu-24.04-cpp.dockerfile +++ b/ci/docker/ubuntu-24.04-cpp.dockerfile @@ -143,7 +143,6 @@ RUN if [ "${gcc_version}" = "" ]; then \ apt-get update -y -q && \ if [ "${gcc_version}" -gt "14" ]; then \ apt-get install -y -q --no-install-recommends \ - g++-snapshot \ gcc-snapshot; \ else \ apt-get install -y -q --no-install-recommends \ From d7ee6f7c2c4e9b526da811d19a4c3c244be0b2c9 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sun, 8 Dec 2024 22:35:13 -0600 Subject: [PATCH 4/9] try snapshot --- ci/docker/ubuntu-24.04-cpp.dockerfile | 9 ++------- dev/tasks/tasks.yml | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile b/ci/docker/ubuntu-24.04-cpp.dockerfile index 1c90309b298f4..f662edc5365bc 100644 --- a/ci/docker/ubuntu-24.04-cpp.dockerfile +++ b/ci/docker/ubuntu-24.04-cpp.dockerfile @@ -141,14 +141,9 @@ RUN if [ "${gcc_version}" = "" ]; then \ add-apt-repository ppa:ubuntu-toolchain-r/volatile; \ fi; \ apt-get update -y -q && \ - if [ "${gcc_version}" -gt "14" ]; then \ - apt-get install -y -q --no-install-recommends \ - gcc-snapshot; \ - else \ - apt-get install -y -q --no-install-recommends \ + apt-get install -y -q --no-install-recommends \ g++-${gcc_version} \ - gcc-${gcc_version}; \ - fi; \ + gcc-${gcc_version} && \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${gcc_version} 100 && \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${gcc_version} 100 && \ update-alternatives --install \ diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index e3927f01e29d4..22fee3da466b0 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -968,10 +968,10 @@ tasks: params: env: CLANG_TOOLS: 15 - GCC_VERSION: 15 + GCC_VERSION: snapshot LLVM: 15 UBUNTU: 24.04 - flags: -e CC=gcc-15 -e CXX=g++-15 -e RapidJSON_SOURCE=BUNDLED + flags: -e CC=gcc-snapshot -e CXX=g++-snapshot -e RapidJSON_SOURCE=BUNDLED image: ubuntu-cpp test-skyhook-integration: From 8f235bd996508f959b711a6a627bcca4211b0ab6 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Tue, 10 Dec 2024 14:06:37 -0600 Subject: [PATCH 5/9] this? --- ci/docker/ubuntu-24.04-cpp.dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile b/ci/docker/ubuntu-24.04-cpp.dockerfile index f662edc5365bc..dfa325dd23540 100644 --- a/ci/docker/ubuntu-24.04-cpp.dockerfile +++ b/ci/docker/ubuntu-24.04-cpp.dockerfile @@ -141,9 +141,14 @@ RUN if [ "${gcc_version}" = "" ]; then \ add-apt-repository ppa:ubuntu-toolchain-r/volatile; \ fi; \ apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ + if [ "${gcc_version}" -eq "snapshot" ]; then \ + apt-get install -y -q --no-install-recommends \ + gcc-${gcc_version} \ + else \ + apt-get install -y -q --no-install-recommends \ g++-${gcc_version} \ - gcc-${gcc_version} && \ + gcc-${gcc_version} \ + fi; \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${gcc_version} 100 && \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${gcc_version} 100 && \ update-alternatives --install \ From 7fa1d13138f01992678884f28fc223cd5444f762 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Tue, 10 Dec 2024 14:23:31 -0600 Subject: [PATCH 6/9] ugh --- ci/docker/ubuntu-24.04-cpp.dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile b/ci/docker/ubuntu-24.04-cpp.dockerfile index dfa325dd23540..3e14aab6efb11 100644 --- a/ci/docker/ubuntu-24.04-cpp.dockerfile +++ b/ci/docker/ubuntu-24.04-cpp.dockerfile @@ -143,11 +143,11 @@ RUN if [ "${gcc_version}" = "" ]; then \ apt-get update -y -q && \ if [ "${gcc_version}" -eq "snapshot" ]; then \ apt-get install -y -q --no-install-recommends \ - gcc-${gcc_version} \ + gcc-${gcc_version} && \ else \ apt-get install -y -q --no-install-recommends \ g++-${gcc_version} \ - gcc-${gcc_version} \ + gcc-${gcc_version} && \ fi; \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${gcc_version} 100 && \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${gcc_version} 100 && \ From 3bd2d900e822db30240f5f84877c7ae1c7e7798f Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Tue, 10 Dec 2024 14:52:14 -0600 Subject: [PATCH 7/9] ugh --- ci/docker/ubuntu-24.04-cpp.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile b/ci/docker/ubuntu-24.04-cpp.dockerfile index 3e14aab6efb11..869fe8f8e5d0e 100644 --- a/ci/docker/ubuntu-24.04-cpp.dockerfile +++ b/ci/docker/ubuntu-24.04-cpp.dockerfile @@ -141,7 +141,7 @@ RUN if [ "${gcc_version}" = "" ]; then \ add-apt-repository ppa:ubuntu-toolchain-r/volatile; \ fi; \ apt-get update -y -q && \ - if [ "${gcc_version}" -eq "snapshot" ]; then \ + if [ "${gcc_version}" == "snapshot" ]; then \ apt-get install -y -q --no-install-recommends \ gcc-${gcc_version} && \ else \ From 9f2d32732d46136262e402943c452c2f8944fe96 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sun, 29 Dec 2024 07:23:18 -0600 Subject: [PATCH 8/9] Kou's comments --- ci/docker/ubuntu-24.04-cpp.dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile b/ci/docker/ubuntu-24.04-cpp.dockerfile index 869fe8f8e5d0e..30ba1a450a44b 100644 --- a/ci/docker/ubuntu-24.04-cpp.dockerfile +++ b/ci/docker/ubuntu-24.04-cpp.dockerfile @@ -138,17 +138,17 @@ RUN if [ "${gcc_version}" = "" ]; then \ if [ "${gcc_version}" -gt "14" ]; then \ apt-get update -y -q && \ apt-get install -y -q --no-install-recommends software-properties-common && \ - add-apt-repository ppa:ubuntu-toolchain-r/volatile; \ + add-apt-repository ppa:ubuntu-toolchain-r/ppa; \ fi; \ apt-get update -y -q && \ if [ "${gcc_version}" == "snapshot" ]; then \ apt-get install -y -q --no-install-recommends \ - gcc-${gcc_version} && \ + gcc-${gcc_version} ; \ else \ apt-get install -y -q --no-install-recommends \ g++-${gcc_version} \ - gcc-${gcc_version} && \ - fi; \ + gcc-${gcc_version} ; \ + fi & \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${gcc_version} 100 && \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${gcc_version} 100 && \ update-alternatives --install \ From 695213a676162f88a179523fd8c1fa1132804c47 Mon Sep 17 00:00:00 2001 From: Jonathan Keane Date: Sun, 29 Dec 2024 07:41:38 -0600 Subject: [PATCH 9/9] a little less dry --- ci/docker/ubuntu-24.04-cpp.dockerfile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile b/ci/docker/ubuntu-24.04-cpp.dockerfile index 30ba1a450a44b..04e9eec5c29fc 100644 --- a/ci/docker/ubuntu-24.04-cpp.dockerfile +++ b/ci/docker/ubuntu-24.04-cpp.dockerfile @@ -135,15 +135,21 @@ RUN if [ "${gcc_version}" = "" ]; then \ g++ \ gcc; \ else \ - if [ "${gcc_version}" -gt "14" ]; then \ + if [ "${gcc_version}" == "snapshot" ]; then \ apt-get update -y -q && \ apt-get install -y -q --no-install-recommends software-properties-common && \ - add-apt-repository ppa:ubuntu-toolchain-r/ppa; \ - fi; \ - apt-get update -y -q && \ - if [ "${gcc_version}" == "snapshot" ]; then \ + add-apt-repository ppa:ubuntu-toolchain-r/ppa && \ + apt-get update -y -q && \ apt-get install -y -q --no-install-recommends \ gcc-${gcc_version} ; \ + elif [ "${gcc_version}" -gt "14" ]; then \ + apt-get update -y -q && \ + apt-get install -y -q --no-install-recommends software-properties-common && \ + add-apt-repository ppa:ubuntu-toolchain-r/ppa && \ + apt-get update -y -q && \ + apt-get install -y -q --no-install-recommends \ + g++-${gcc_version} \ + gcc-${gcc_version} ; \ else \ apt-get install -y -q --no-install-recommends \ g++-${gcc_version} \