diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2022-11-04 20:29:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 20:29:51 +0100 |
| commit | 441f98d02deafd9b090aea568282b28f66a50e36 (patch) | |
| tree | b85eb37e375c97ffadfbd0a4de8fb3e8971ce59c | |
| parent | 41c9daa3374892f2dcf04f63c3cb1b4eea054e1b (diff) | |
| parent | 6c4749f3957712659ec1563a4191f50c162e8a90 (diff) | |
| download | libexpat-git-441f98d02deafd9b090aea568282b28f66a50e36.tar.gz | |
Merge pull request #675 from libexpat/fix-ci
Fix CI / coverage.yml: Drop ppa:ondrej/php removal
| -rw-r--r-- | .github/workflows/coverage.yml | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c59f8284..4158db39 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -45,7 +45,7 @@ jobs: - uses: actions/checkout@v3.1.0 - name: Install build dependencies run: |- - set -x -u -o pipefail + set -x -u source /etc/os-release sudo apt-get update @@ -60,18 +60,6 @@ jobs: lzip \ moreutils - # 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, 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' | grep -F deb.sury.org | awk '{print $2}' | grep '^php' \ - | xargs -r -t sudo apt-get remove --yes libpcre2-posix3 libzip4 - dpkg -l | grep '^ii' | grep -F 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' | grep -F deb.sury.org - # Install 32bit Wine sudo dpkg --add-architecture i386 # for wine32 sudo apt-get update # due to new architecture |