Skip to content

Commit 09707de

Browse files
committed
ci: avoid pipefail in package checks
Signed-off-by: Favilances Noir <favilances@proton.me>
1 parent 3056683 commit 09707de

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

scripts/ci-build-linux-packages.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ fi
6262

6363
if [ -f "$bundle_dir/deb/"*.deb ]; then
6464
cp "$bundle_dir/deb/"*.deb dist/differ-linux-x64.deb
65-
dpkg-deb --field dist/differ-linux-x64.deb Depends | grep -q 'git'
66-
dpkg-deb --field dist/differ-linux-x64.deb Depends | grep -q 'gnupg'
65+
deb_depends="$(dpkg-deb --field dist/differ-linux-x64.deb Depends)"
66+
[[ "$deb_depends" == *git* ]]
67+
[[ "$deb_depends" == *gnupg* ]]
6768
fi
6869

6970
if [ -f "$bundle_dir/rpm/"*.rpm ]; then
@@ -127,8 +128,10 @@ fi
127128

128129
tar --sort=name --owner=0 --group=0 --numeric-owner --zstd \
129130
-cf "dist/differ-linux-x64.pkg.tar.zst" -C "$pkg_root" .PKGINFO opt usr
130-
tar -tf "dist/differ-linux-x64.pkg.tar.zst" | grep -qx '.PKGINFO'
131-
tar -xOf "dist/differ-linux-x64.pkg.tar.zst" .PKGINFO | grep -q '^depend = git$'
132-
tar -xOf "dist/differ-linux-x64.pkg.tar.zst" .PKGINFO | grep -q '^depend = gnupg$'
131+
pkg_entries="$(tar -tf "dist/differ-linux-x64.pkg.tar.zst")"
132+
pkg_info="$(tar -xOf "dist/differ-linux-x64.pkg.tar.zst" .PKGINFO)"
133+
[[ "$pkg_entries" == .PKGINFO$'\n'* ]]
134+
[[ "$pkg_info" == *$'\ndepend = git\n'* ]]
135+
[[ "$pkg_info" == *$'\ndepend = gnupg\n'* ]]
133136

134137
rm -rf "$pkg_dir"

0 commit comments

Comments
 (0)