Skip to content

Commit b318516

Browse files
committed
Switch to sequoia for codecov signature check
GnuPG in F39 seems to use keyboxd and as a consequence, keyring choice on import seems to be ignored: + gpg --no-default-keyring --keyring trustedkeys.gpg --import ci/codecov-keys.asc gpg: directory '/home/gitlab-runner/.gnupg' created gpg: /home/gitlab-runner/.gnupg/trustdb.gpg: trustdb created gpg: key 806BB28AED779869: public key "Codecov Uploader (Codecov Uploader Verification Key) <[email protected]>" imported gpg: Total number processed: 1 gpg: imported: 1 + curl -Os https://uploader.codecov.io/latest/linux/codecov + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM + curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig + gpgv codecov.SHA256SUM.sig codecov.SHA256SUM gpgv: unknown type of key resource 'trustedkeys.kbx' gpgv: keyblock resource '/home/gitlab-runner/.gnupg/trustedkeys.kbx': General error gpgv: Signature made Thu Oct 19 19:59:46 2023 UTC gpgv: using RSA key 27034E7FDB850E0BBC2C62FF806BB28AED779869 gpgv: Can't check signature: No public key The actual key got imported into default keyring, disregarding "--no-default-keyring --keyring trustedkeys.gpg". Instead of fighting with GnuPG bug, switch to Sequoia, which is a good idea anyway.
1 parent c918563 commit b318516

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include:
1515
- "PATH=$PATH:$HOME/.local/bin"
1616
- sudo dnf install -y python3-pip python3-gobject gtk3 python3-pytest
1717
python3-coverage python3-devel pam-devel pandoc gcc git make findutils clang
18-
xorg-x11-server-Xvfb python3-pytest-asyncio python3-inotify
18+
xorg-x11-server-Xvfb python3-pytest-asyncio python3-inotify sequoia-sqv
1919
- git config --global --add safe.directory "${CI_PROJECT_DIR}"
2020
- git clone https://github.com/QubesOS/qubes-core-vchan-socket ~/qubes-core-vchan-socket
2121
- make -C ~/qubes-core-vchan-socket all

ci/codecov-wrapper

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
set -xe
44

5-
gpg --no-default-keyring --keyring trustedkeys.gpg --import ci/codecov-keys.asc
6-
75
curl -Os https://uploader.codecov.io/latest/linux/codecov
86
curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM
97
curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig
108

11-
gpgv codecov.SHA256SUM.sig codecov.SHA256SUM
9+
sqv --keyring ci/codecov-keys.asc codecov.SHA256SUM.sig codecov.SHA256SUM
1210
shasum -a 256 -c codecov.SHA256SUM
1311

1412
chmod +x codecov

0 commit comments

Comments
 (0)