Fix: CI: some adjustments (#10)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6df338f9da36a97da45c7bfe443c90e98839204..6a27e8b9eae09f5e794e5fff4db7fd9122241e45 100644 (file)
--- 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
-    # ...