Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Joey Parrish 2024-12-12 10:22:30 -08:00 committed by GitHub
parent a26e6623d6
commit 154c1b3a18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yaml vendored
View File

@ -105,7 +105,7 @@ jobs:
# that may be greater than what is available in Ubuntu, so we set up # that may be greater than what is available in Ubuntu, so we set up
# the official CMake PPA first. # the official CMake PPA first.
run: | 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_key_path="/usr/share/keyrings/kitware-archive-keyring.gpg"
kitware_sources_path="/etc/apt/sources.list.d/kitware.list" kitware_sources_path="/etc/apt/sources.list.d/kitware.list"
@ -114,7 +114,7 @@ jobs:
. /etc/lsb-release # Defines $DISTRIB_CODENAME (jammy, focal, etc) . /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 tee "$kitware_sources_path" >/dev/null
sudo apt update sudo apt update

6
packager/testing/dockers/Ubuntu_Dockerfile
View File

@ -10,13 +10,13 @@ RUN apt-get install -y \
build-essential git ninja-build python3 wget build-essential git ninja-build python3 wget
# Install the official CMake repo to get CMake v3.24+: # 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_key_path /usr/share/keyrings/kitware-archive-keyring.gpg
ENV kitware_sources_path /etc/apt/sources.list.d/kitware.list ENV kitware_sources_path /etc/apt/sources.list.d/kitware.list
ENV DISTRIB_CODENAME jammy ENV DISTRIB_CODENAME jammy
RUN wget -O - "$kitware_key_url" 2>/dev/null | gpg --dearmor - > "$kitware_key_path" RUN curl -sLk "$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 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 RUN apt-get update && apt-get install -y cmake