Try to fix certificate errors.

p4lang · Jul 19, 2023 · 1b07319 · 1b07319
1 parent 7cf4952
commit 1b07319
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
@@ -100,11 +100,11 @@ if [[ "${DISTRIB_RELEASE}" == "18.04" ]] || [[ "$(which simple_switch 2> /dev/nu
   export CC=gcc-9
   export CXX=g++-9
 else
-  sudo apt-get update && sudo apt-get install -y curl gnupg
-  echo "deb https://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE}/ /" | sudo tee /etc/apt/sources.list.d/home:p4lang.list
-  curl -L "https://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE}/Release.key" | sudo apt-key add -
-  # Try to avoid certificate errors.
-  sudo apt install ca-certificates
+  sudo apt-get update && sudo apt-get install -y wget ca-certificates
+  # Add the p4lang opensuse repository in a secure fashion.
+  sudo mkdir -p /etc/apt/keyrings/p4lang
+  wget -O- https://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE}/Release.gpg | gpg --dearmor | sudo tee /etc/apt/keyrings/p4lang/p4lang-release-keyring.gpg > /dev/null
+  echo "deb [signed-by=/etc/apt/keyrings/p4lang/p4lang-release-keyring.gpg] https://download.opensuse.org/repositories/home:/p4lang/xUbuntu_${DISTRIB_RELEASE} stable main" | sudo tee /etc/apt/sources.list.d/home:p4lang.list
   P4C_DEPS+=" p4lang-bmv2"
 fi