From ec4a34567553e1822ab5f7f02ae2bd94863f2c84 Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Sun, 21 Sep 2025 13:29:13 -0400 Subject: [PATCH 1/4] Update CI job so as to not fail on Debian updates --- ci/scripts/r_docker_configure.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/scripts/r_docker_configure.sh b/ci/scripts/r_docker_configure.sh index a41ff34e067..aabc4e34f2e 100755 --- a/ci/scripts/r_docker_configure.sh +++ b/ci/scripts/r_docker_configure.sh @@ -41,7 +41,7 @@ elif [ "`which zypper`" ]; then PACKAGE_MANAGER=zypper else PACKAGE_MANAGER=apt-get - apt-get update + apt-get update --allow-releaseinfo-change fi # Enable ccache if requested based on http://dirk.eddelbuettel.com/blog/2017/11/27/ @@ -79,11 +79,11 @@ $PACKAGE_MANAGER install -y rsync cmake curl # This is only for rhub/clang20. If we change the base image from rhub/clang20, # we need to update this part too. if [ "$R_UPDATE_CLANG" = true ]; then - apt update -y + apt update -y --allow-releaseinfo-change apt install -y gnupg curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/llvm.gpg echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" > /etc/apt/sources.list.d/llvm20.list - apt update -y + apt update -y --allow-releaseinfo-change apt install -y clang-20 lld-20 fi From 470b8657c83811899eb25ed38d7bfb54ceeb95b7 Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Sun, 21 Sep 2025 23:25:37 -0400 Subject: [PATCH 2/4] Update ci/scripts/r_docker_configure.sh --- ci/scripts/r_docker_configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/r_docker_configure.sh b/ci/scripts/r_docker_configure.sh index aabc4e34f2e..bab2fac4fc7 100755 --- a/ci/scripts/r_docker_configure.sh +++ b/ci/scripts/r_docker_configure.sh @@ -41,7 +41,7 @@ elif [ "`which zypper`" ]; then PACKAGE_MANAGER=zypper else PACKAGE_MANAGER=apt-get - apt-get update --allow-releaseinfo-change + apt-get update --allow-releaseinfo-change # flag needed for when debian version changes fi # Enable ccache if requested based on http://dirk.eddelbuettel.com/blog/2017/11/27/ From aaedc25e2f5cfae8c0e7254f9c78f0922bf8327b Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Sun, 21 Sep 2025 23:25:52 -0400 Subject: [PATCH 3/4] Update ci/scripts/r_docker_configure.sh --- ci/scripts/r_docker_configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/r_docker_configure.sh b/ci/scripts/r_docker_configure.sh index bab2fac4fc7..b6887b31fe3 100755 --- a/ci/scripts/r_docker_configure.sh +++ b/ci/scripts/r_docker_configure.sh @@ -79,7 +79,7 @@ $PACKAGE_MANAGER install -y rsync cmake curl # This is only for rhub/clang20. If we change the base image from rhub/clang20, # we need to update this part too. if [ "$R_UPDATE_CLANG" = true ]; then - apt update -y --allow-releaseinfo-change + apt update -y --allow-releaseinfo-change # flag needed for when debian version changes apt install -y gnupg curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/llvm.gpg echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" > /etc/apt/sources.list.d/llvm20.list From ecefc51e74e99e19ef093348b6067d7c3b31a687 Mon Sep 17 00:00:00 2001 From: Nic Crane Date: Sun, 21 Sep 2025 23:26:08 -0400 Subject: [PATCH 4/4] Update ci/scripts/r_docker_configure.sh --- ci/scripts/r_docker_configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/r_docker_configure.sh b/ci/scripts/r_docker_configure.sh index b6887b31fe3..3039291ebbd 100755 --- a/ci/scripts/r_docker_configure.sh +++ b/ci/scripts/r_docker_configure.sh @@ -83,7 +83,7 @@ if [ "$R_UPDATE_CLANG" = true ]; then apt install -y gnupg curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/llvm.gpg echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" > /etc/apt/sources.list.d/llvm20.list - apt update -y --allow-releaseinfo-change + apt update -y --allow-releaseinfo-change # flag needed for when debian version changes apt install -y clang-20 lld-20 fi