Skip to content

Commit

Permalink
Switch to sequoia for codecov signature check
Browse files Browse the repository at this point in the history
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.

(cherry picked from commit 5bf2b11)
  • Loading branch information
marmarek committed Jan 31, 2024
1 parent 488f76c commit 6ba1513
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ checks:tests:
after_script:
- ci/codecov-wrapper -F unittests
before_script:
- sudo dnf install -y lvm2 vim-common python3-lxml python3-docutils
- sudo dnf install -y lvm2 vim-common python3-lxml python3-docutils sequoia-sqv
- git clone -b release4.1 https://github.com/QubesOS/qubes-core-qrexec ~/qubes-core-qrexec
- pip3 install --user --quiet -r ci/requirements.txt
script:
Expand Down
4 changes: 1 addition & 3 deletions ci/codecov-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

set -xe

gpg --no-default-keyring --keyring trustedkeys.gpg --import ci/codecov-keys.asc

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
sqv --keyring ci/codecov-keys.asc codecov.SHA256SUM.sig codecov.SHA256SUM
shasum -a 256 -c codecov.SHA256SUM

chmod +x codecov
Expand Down

0 comments on commit 6ba1513

Please sign in to comment.