From 1398c4d354822b2cdd67cdea857f73ce6117cf6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Wed, 15 Jan 2025 19:14:53 +0100 Subject: [PATCH] Use `sq` to retrieve the keys from the keyserver on trixie Fixes #1052 --- .github/workflows/check_repos.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check_repos.yml b/.github/workflows/check_repos.yml index db33f9a..51facf0 100644 --- a/.github/workflows/check_repos.yml +++ b/.github/workflows/check_repos.yml @@ -47,6 +47,7 @@ jobs: apt-get install python-all -y - name: Add GPG key for the packages.freedom.press + if: matrix.version != 'trixie' run: | apt-get update && apt-get install -y gnupg2 ca-certificates dirmngr # NOTE: This is a command that's necessary only in containers @@ -54,8 +55,16 @@ jobs: --no-default-keyring --keyring ./fpf-apt-tools-archive-keyring.gpg \ --recv-keys "DE28 AB24 1FA4 8260 FAC9 B8BA A7C9 B385 2260 4281" mkdir -p /etc/apt/keyrings/ - mv fpf-apt-tools-archive-keyring.gpg /etc/apt/keyrings - + mv fpf-apt-tools-archive-keyring.gpg /etc/apt/keyrings/. + - name: Add GPG key using sq for pacakges.freedom.press + if: matrix.version == 'trixie' + run: | + apt-get update && apt-get install -y sq + mkdir -p /etc/apt/keyrings/ + sq network keyserver \ + --server hkps://keys.openpgp.org \ + search "DE28 AB24 1FA4 8260 FAC9 B8BA A7C9 B385 2260 4281" \ + --output /etc/apt/keyrings/fpf-apt-tools-archive-keyring.gpg - name: Add packages.freedom.press to our APT sources run: | . /etc/os-release