From 5084a7305ec2684e8b8957da888788be99b3efeb Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 4 Jan 2025 17:46:37 -0300
Subject: Fix: CI: some adjustments (#10)
---
.gitlab-ci.yml | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6df338..6a27e8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,7 @@
---
+variables:
+ KEYRINGER_NON_INTERACTIVE: "1"
+
debian:
image: debian:testing
script:
@@ -41,7 +44,8 @@ debian:
- gbp buildpackage --git-ignore-new --git-upstream-signatures=no --git-no-sign-tags -us -uc
# Run lintian
- #- lintian --allow-root -v --pedantic ../keyringer_*.deb
+ # Usually gbp-buildpackage already calls lintian, but we run it again just to make sure
+ - lintian --allow-root -v --pedantic ../keyringer_*.deb
# Run piuparts
#- piuparts ../keyringer*.deb
@@ -73,8 +77,9 @@ test:
- mkdir -p ~/temp/tests
- git config --global user.name 'Test'
- git config --global user.email 'test@example.org'
- - KEYRINGER_NON_INTERACTIVE=1 ./keyringer test init ~/temp/tests/keyringer
- - gpg --with-colons --list-keys | grep uid | awk -F ':' '{ x = $10; gsub(/.*</, "", x); gsub(/>/, "", x); print x, $8; }' >> ~/temp/tests/keyringer/config/recipients/default
+ - ./keyringer test init ~/temp/tests/keyringer
+ - gpg --with-colons --list-keys | grep "^uid" | awk -F ':' '{ x = $10; gsub(/.*</, "", x); gsub(/>/, "", x); print x, $8; }' >> ~/temp/tests/keyringer/config/recipients/default
+ - ./keyringer test recipients ls
# Test the keyring in the develop branch
# This will also test the expiration of the upstream signing key
@@ -82,6 +87,3 @@ test:
# Tear down the keyring in the develop branch
- ./keyringer test teardown -y
-
- # Test in the main branch
- # ...
--
cgit v1.2.3