Deb PPA: some more cleanup in buildd job

This commit is contained in:
Roman Lebedev 2025-09-25 21:57:33 +03:00
parent d21d263698
commit d13164cb1f
No known key found for this signature in database
GPG Key ID: 083C3EBB4A1689E0

View File

@ -144,8 +144,9 @@ jobs:
#\$host_arch = '${{ inputs.arch }}'; #\$host_arch = '${{ inputs.arch }}';
\$chroot_mode = 'unshare'; \$chroot_mode = 'unshare';
\$unshare_tmpdir_template = '/tmp/tmp.sbuild.XXXXXXXXXX'; \$unshare_tmpdir_template = '/tmp/tmp.sbuild.XXXXXXXXXX';
EOT \$run_lintian = 1;
tee -a ~/.sbuildrc > /dev/null <<EOT \$run_piuparts = 0;
\$run_autopkgtest = 0;
push @{\$unshare_mmdebstrap_extra_args}, "*", [ push @{\$unshare_mmdebstrap_extra_args}, "*", [
'--variant=apt' '--variant=apt'
]; ];
@ -162,13 +163,22 @@ jobs:
else else
exit 1 exit 1
fi fi
if [ "${{ inputs.dist-name }}" = "debian" ];
then
KEYRING="/usr/share/keyrings/debian-keyring.gpg"
elif [ "${{ inputs.dist-name }}" = "ubuntu" ];
then
KEYRING="/usr/share/keyrings/ubuntu-archive-keyring.gpg"
else
exit 1
fi
echo "MIRROR=$(echo ${MIRROR})" >> $GITHUB_ENV echo "MIRROR=$(echo ${MIRROR})" >> $GITHUB_ENV
if [ "${{ inputs.dist-name }}" = "debian" ]; if [ "${{ inputs.dist-name }}" = "debian" ];
then then
tee -a ~/.sbuildrc > /dev/null <<EOT tee -a ~/.sbuildrc > /dev/null <<EOT
push @{\$unshare_mmdebstrap_extra_args}, "*", [ push @{\$unshare_mmdebstrap_extra_args}, "*", [
'$MIRROR', '$MIRROR',
'--keyring=/usr/share/keyrings/debian-keyring.gpg', '--keyring=$KEYRING',
'--components=main' '--components=main'
]; ];
EOT EOT
@ -187,7 +197,7 @@ jobs:
tee -a ~/.sbuildrc > /dev/null <<EOT tee -a ~/.sbuildrc > /dev/null <<EOT
push @{\$unshare_mmdebstrap_extra_args}, "*", [ push @{\$unshare_mmdebstrap_extra_args}, "*", [
'$MIRROR', '$MIRROR',
'--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg', '--keyring=$KEYRING',
'--components=main,universe' '--components=main,universe'
]; ];
\$extra_repositories = [ \$extra_repositories = [