boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 75e9ffda by Nicolas Vigier at 2025-11-26T12:02:36+01:00 Bug 41601: Always run dpkg --add-architecture in linux-cross builds - - - - - 1 changed file: - projects/container-image/config Changes: ===================================== projects/container-image/config ===================================== @@ -34,11 +34,14 @@ pre: | apt-get update -y -q [% IF pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) -%] [% pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) %] - [% IF c("var/linux-cross") && ! pc(c('origin_project'), 'var/no_crosscompile', { step => c('origin_step') }) -%] - dpkg --add-architecture [% c("var/arch_debian") %] - [% END -%] - # Update the package cache again because `pre_pkginst` may change the - # package manager configuration. + [% END -%] + [% IF c("var/linux-cross") && ! pc(c('origin_project'), 'var/no_crosscompile', { step => c('origin_step') }) -%] + dpkg --add-architecture [% c("var/arch_debian") %] + [% END -%] + [% IF pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) || + ( c("var/linux-cross") && ! pc(c('origin_project'), 'var/no_crosscompile', { step => c('origin_step') }) ) -%] + # Update the package cache again because `pre_pkginst` or + # `dpkg --add-architecture` may change the package manager configuration. apt-get update -y -q [% END -%] apt-get upgrade -y -q View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/75... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/75... You're receiving this email because of your account on gitlab.torproject.org.