diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2022-04-08 20:47:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 20:47:27 +0200 |
| commit | c2b66f844d4a0494c3cd7292a05866e3f938659c (patch) | |
| tree | b13294a607f7c4dec93da863f8dcc3134dc741b2 | |
| parent | 49fffa3203ec746c1e0add666535dc705d9d5cec (diff) | |
| parent | df74993b08fb49f701f67e63ba93b3a750e5054c (diff) | |
| download | uriparser-c2b66f844d4a0494c3cd7292a05866e3f938659c.tar.gz | |
Merge pull request #145 from uriparser/mingw-ubuntu-20-04
Actions: Sync libwine:i386 conflict resolution code
| -rw-r--r-- | .github/workflows/build-and-test.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5bc732b..81f7699 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -65,11 +65,11 @@ jobs: # Get rid of packages installed from ppa:ondrej/php so that we will be able to install wine32:i386 without conflicts # (see issue https://github.com/actions/virtual-environments/issues/4589) # In detail we: - # 1. Remove all packages that ppa:ondrej/php has but plain Ubuntu doesn't, i.e. libzip4 and everything PHP + # 1. Remove all packages that ppa:ondrej/php has but plain Ubuntu doesn't, e.g. everything PHP # 2. Revert (remaining) packages that ppa:ondrej/php and plain Ubuntu share, back to the plain Ubuntu version # 3. Assert that no packages from ppa:ondrej/php are left installed dpkg -l | grep '^ii' | fgrep deb.sury.org | awk '{print $2}' | grep '^php' \ - | xargs -r -t sudo apt-get remove --yes libzip4 + | xargs -r -t sudo apt-get remove --yes libpcre2-posix3 libzip4 dpkg -l | grep '^ii' | fgrep deb.sury.org | awk '{print $2}' | sed "s,\$,/${UBUNTU_CODENAME}," \ | xargs -r -t sudo apt-get install --yes --no-install-recommends --allow-downgrades -V ! dpkg -l | grep '^ii' | fgrep deb.sury.org |