Skip to content

Commit

Permalink
ci: Ignore cert error for apt.kitware.com (#1459)
Browse files Browse the repository at this point in the history
This should fix the retrieval of the GPG key and allow an updated cmake to be installed.
  • Loading branch information
joeyparrish authored Dec 12, 2024
1 parent a26e662 commit 154c1b3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions packager/testing/dockers/Ubuntu_Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 154c1b3

Please sign in to comment.