From 154c1b3a18d21e0b2214a7d971d4e26e221b11c2 Mon Sep 17 00:00:00 2001 From: Joey Parrish Date: Thu, 12 Dec 2024 10:22:30 -0800 Subject: [PATCH] ci: Ignore cert error for apt.kitware.com (#1459) This should fix the retrieval of the GPG key and allow an updated cmake to be installed. --- .github/workflows/build.yaml | 4 ++-- packager/testing/dockers/Ubuntu_Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 91e1ba0991d..fd92284c61a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -105,7 +105,7 @@ jobs: # that may be greater than what is available in Ubuntu, so we set up # the official CMake PPA first. run: | - kitware_key_url="https://apt.kitware.com/keys/kitware-archive-latest.asc" + kitware_key_url="http://apt.kitware.com/keys/kitware-archive-latest.asc" kitware_key_path="/usr/share/keyrings/kitware-archive-keyring.gpg" kitware_sources_path="/etc/apt/sources.list.d/kitware.list" @@ -114,7 +114,7 @@ jobs: . /etc/lsb-release # Defines $DISTRIB_CODENAME (jammy, focal, etc) - echo "deb [signed-by=$kitware_key_path] https://apt.kitware.com/ubuntu/ $DISTRIB_CODENAME main" \ + echo "deb [signed-by=$kitware_key_path] http://apt.kitware.com/ubuntu/ $DISTRIB_CODENAME main" \ | sudo tee "$kitware_sources_path" >/dev/null sudo apt update diff --git a/packager/testing/dockers/Ubuntu_Dockerfile b/packager/testing/dockers/Ubuntu_Dockerfile index 57f1f5fda94..02d07302e85 100644 --- a/packager/testing/dockers/Ubuntu_Dockerfile +++ b/packager/testing/dockers/Ubuntu_Dockerfile @@ -10,13 +10,13 @@ RUN apt-get install -y \ build-essential git ninja-build python3 wget # Install the official CMake repo to get CMake v3.24+: -ENV kitware_key_url https://apt.kitware.com/keys/kitware-archive-latest.asc +ENV kitware_key_url http://apt.kitware.com/keys/kitware-archive-latest.asc ENV kitware_key_path /usr/share/keyrings/kitware-archive-keyring.gpg ENV kitware_sources_path /etc/apt/sources.list.d/kitware.list ENV DISTRIB_CODENAME jammy -RUN wget -O - "$kitware_key_url" 2>/dev/null | gpg --dearmor - > "$kitware_key_path" -RUN echo "deb [signed-by=$kitware_key_path] https://apt.kitware.com/ubuntu/ $DISTRIB_CODENAME main" > "$kitware_sources_path" +RUN curl -sLk "$kitware_key_url" 2>/dev/null | gpg --dearmor - > "$kitware_key_path" +RUN echo "deb [signed-by=$kitware_key_path] http://apt.kitware.com/ubuntu/ $DISTRIB_CODENAME main" > "$kitware_sources_path" RUN apt-get update && apt-get install -y cmake