Skip to content

Commit 5eab3b6

Browse files
authored
Use aptitude for Ubuntu 86 dependencies (#1086)
* Try aptitude instead of apt * Update utils.py * Update utils.py * Update utils.py * Update utils.py
1 parent 915e5a3 commit 5eab3b6

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

scripts/gha/utils.py

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,6 @@ def install_x86_support_libraries(gha_build=False):
232232
packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386',
233233
'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386',
234234
'libssl-dev:i386']
235-
if gha_build:
236-
# Workaround for GitHub runners, which have an incompatibility between the
237-
# 64-bit and 32-bit versions of the Ubuntu package libpcre2-8-0. Downgrade
238-
# the installed 64-bit version of the library to get around this issue.
239-
# This will presumably be fixed in a future Ubuntu update. (If you remove
240-
# it, remove the workaround further down this function as well.)
241-
packages = ['--allow-downgrades'] + packages + ['libpcre2-8-0=10.34-7']
242235

243236
# First check if these packages exist on the machine already
244237
with open(os.devnull, "w") as devnull:
@@ -249,14 +242,5 @@ def install_x86_support_libraries(gha_build=False):
249242
# Install them.
250243
run_command(['dpkg', '--add-architecture', 'i386'], as_root=True, check=True)
251244
run_command(['apt', 'update'], as_root=True, check=True)
252-
run_command(['apt', 'install', '-V', '-y'] + packages, as_root=True, check=True)
253-
254-
if gha_build:
255-
# One more workaround: downgrading libpcre2-8-0 above may have uninstalled
256-
# libsecret, which is required for the Linux build. Force it to be
257-
# reinstalled, but do it as a separate command to ensure that held
258-
# packages aren't modified. (Once the workaround above is removed, this can
259-
# be removed as well.)
260-
# Note: "-f" = "fix" - let apt do what it needs to do to fix dependencies.
261-
run_command(['apt', 'install', '-f', '-V', '-y', 'libsecret-1-dev'],
262-
as_root=True, check=True)
245+
run_command(['apt', 'install', 'aptitude'], as_root=True, check=True)
246+
run_command(['aptitude', 'install', '-V', '-y'] + packages, as_root=True, check=True)

0 commit comments

Comments
 (0)