Skip to content

Commit ba2aa63

Browse files
committed
Update PCRE package list.
1 parent 49598c3 commit ba2aa63

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

scripts/gha/utils.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,7 @@ def install_x86_support_libraries(gha_build=False):
237237
if is_linux_os():
238238
packages = ['gcc-multilib', 'g++-multilib', 'libglib2.0-dev:i386',
239239
'libsecret-1-dev:i386', 'libpthread-stubs0-dev:i386',
240-
'libssl-dev:i386', 'libsecret-1-0:i386',
241-
'libpcre2-posix2:i386']
240+
'libssl-dev:i386', 'libsecret-1-0:i386']
242241
remove_packages = []
243242

244243
# First check if these packages exist on the machine already
@@ -256,10 +255,8 @@ def install_x86_support_libraries(gha_build=False):
256255
if gha_build:
257256
# Remove libpcre to prevent package conflicts.
258257
# Only remove packages on GitHub runners.
259-
remove_packages = ['libpcre2-dev:amd64', 'libpcre2-32-0:amd64',
260-
'libpcre2-8-0:amd64', 'libpcre2-16-0:amd64',
261-
'libpcre3-dev:amd64', 'libpcre3-0:amd64',
262-
'libpcre16-0:amd64', 'libpcre32-0:amd64']
258+
remove_packages = ['libpcre2-16-0:amd64', 'libpcre2-32-0:amd64', 'libpcre2-8-0:amd64',
259+
'libpcre2-posix3:amd64', 'libpcre2-dev:amd64', 'pcre2-utils:amd64']
263260
# Note: With aptitude, you can remove package 'xyz' by specifying 'xyz-'
264261
# in the package list.
265262
run_command(['aptitude', 'install', '-V', '-y'] + packages +

0 commit comments

Comments
 (0)