Tell apk that icu-data-en can be upgraded to icu-data-full (#774)

pull/779/head 2.1.37
Michele Locati 2023-07-11 15:09:03 +02:00 committed by GitHub
parent c4573cf2f1
commit 580cdccf54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 15 deletions

View File

@ -192,3 +192,14 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- run: ./install-php-extensions ${{ matrix.source }} - run: ./install-php-extensions ${{ matrix.source }}
test_upgrading_icu_data_en:
name: Test that icu-data-en can be upgraded
needs:
- check_syntax_data
- check_syntax_shell
- check_syntax_php
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- run: docker run --rm --volume "$(pwd):/app" --workdir /app php:8.2-cli-alpine ./scripts/test-icu-data-en-upgradable

View File

@ -4116,25 +4116,27 @@ cleanup() {
fi fi
done done
fi fi
if test -n "$PACKAGES_VOLATILE"; then case "$DISTRO" in
printf '### REMOVING UNNEEDED PACKAGES ###\n' alpine)
case "$DISTRO" in if stringInList icu-libs "${PACKAGES_PERSISTENT_NEW:-}" && stringInList icu-data-en "${PACKAGES_PERSISTENT_NEW:-}"; then
alpine) apk del icu-data-en >/dev/null 2>&1 || true
fi
if test -n "$PACKAGES_VOLATILE"; then
printf '### REMOVING UNNEEDED PACKAGES ###\n'
apk del --purge $PACKAGES_VOLATILE apk del --purge $PACKAGES_VOLATILE
;; fi
debian) ;;
debian)
if test -n "$PACKAGES_VOLATILE"; then
printf '### REMOVING UNNEEDED PACKAGES ###\n'
DEBIAN_FRONTEND=noninteractive apt-get remove --purge -y $PACKAGES_VOLATILE DEBIAN_FRONTEND=noninteractive apt-get remove --purge -y $PACKAGES_VOLATILE
;; fi
esac if test -n "$PACKAGES_PREVIOUS"; then
fi
if test -n "$PACKAGES_PREVIOUS"; then
case "$DISTRO" in
debian)
printf '### RESTORING PREVIOUSLY INSTALLED PACKAGES ###\n' printf '### RESTORING PREVIOUSLY INSTALLED PACKAGES ###\n'
DEBIAN_FRONTEND=noninteractive apt-get install -qqy --no-install-recommends --no-upgrade $IPE_APTGET_INSTALLOPTIONS $PACKAGES_PREVIOUS DEBIAN_FRONTEND=noninteractive apt-get install -qqy --no-install-recommends --no-upgrade $IPE_APTGET_INSTALLOPTIONS $PACKAGES_PREVIOUS
;; fi
esac ;;
fi esac
docker-php-source delete docker-php-source delete
rm -rf /tmp/src rm -rf /tmp/src
rm -rf /tmp/pickle rm -rf /tmp/pickle

View File

@ -0,0 +1,10 @@
#!/bin/sh
# Let's set a sane environment
set -o errexit
set -o nounset
IPE_ICU_EN_ONLY=1 CI=true ./install-php-extensions intl
apk update
apk add --simulate chromium