Skip to content

Commit 1a3c167

Browse files
committed
Attempt to remove libpcre3.
1 parent e36be60 commit 1a3c167

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

scripts/gha/utils.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,13 @@ def install_x86_support_libraries(gha_build=False):
252252
check=True)
253253
run_command(['apt', 'update'], as_root=True, check=True)
254254
run_command(['apt', 'install', 'aptitude'], as_root=True, check=True)
255-
#if gha_build:
256-
# Remove libpcre to prevent package conflicts.
257-
# Only remove packages on GitHub runners.
258-
# remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64',
259-
# 'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64']
255+
if gha_build:
256+
# Remove libpcre to prevent package conflicts.
257+
# Only remove packages on GitHub runners.
258+
remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64',
259+
'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64',
260+
'libpcre3-dev:amd64', 'libpcre3-0:amd64',
261+
'libpcre16-0:amd64', 'libpcre32-0:amd64']
260262
# Note: With aptitude, you can remove package 'xyz' by specifying 'xyz-'
261263
# in the package list.
262264
run_command(['aptitude', 'install', '-V', '-y'] + packages +

0 commit comments

Comments
 (0)