diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5d636c..d4db5a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,10 +42,16 @@ jobs: uses: actions/checkout@v2 - name: Package and ship run: | + curl -sSLO http://archive.ubuntu.com/ubuntu/pool/universe/libz/libzstd/zstd_1.4.4+dfsg-3_amd64.deb + sudo DEBIAN_FRONTEND=noninteractive dpkg -i --force-conflicts zstd_1.4.4+dfsg-3_amd64.deb + zstd -V for v in 5.3 5.4 5.5; do - sudo XZ_OPT=-e9 tar cfJ php-$v.tar.xz php-$v + sudo XZ_OPT=-0 tar cfJ php-$v.tar.xz php-$v + sudo tar cf - php-$v | zstd --fast=7 > php-$v.tar.zst curl --user "$BINTRAY_USER":"$BINTRAY_KEY" -X DELETE https://api.bintray.com/content/"$BINTRAY_USER"/"$BINTRAY_REPO"/php-$v.tar.xz || true + curl --user "$BINTRAY_USER":"$BINTRAY_KEY" -X DELETE https://api.bintray.com/content/"$BINTRAY_USER"/"$BINTRAY_REPO"/php-$v.tar.zst || true curl --user "$BINTRAY_USER":"$BINTRAY_KEY" -T php-$v.tar.xz https://api.bintray.com/content/shivammathur/php/"$v"-linux/"$v"/php-$v.tar.xz || true + curl --user "$BINTRAY_USER":"$BINTRAY_KEY" -T php-$v.tar.zst https://api.bintray.com/content/shivammathur/php/"$v"-linux/"$v"/php-$v.tar.zst || true curl --user "$BINTRAY_USER":"$BINTRAY_KEY" -X POST https://api.bintray.com/content/"$BINTRAY_USER"/"$BINTRAY_REPO"/"$v"-linux/"$v"/publish || true done env: diff --git a/README.md b/README.md index 5eb5c82..725744d 100644 --- a/README.md +++ b/README.md @@ -45,3 +45,4 @@ curl -sSL https://github.com/shivammathur/php5-ubuntu/releases/latest/download/i - [PhpRedis](https://github.com/phpredis/phpredis "Redis PHP extension") - [Xdebug](https://github.com/xdebug/xdebug "Xdebug PHP extension") - [Zend OPCache](https://github.com/zendtech/ZendOptimizerPlus "Zend OPCache extension") +- [Zstandard](https://github.com/facebook/zstd "Zstandard compression algorithm") diff --git a/php-5.3/install.sh b/php-5.3/install.sh index f9164fb..fc4790f 100644 --- a/php-5.3/install.sh +++ b/php-5.3/install.sh @@ -1,5 +1,5 @@ dpkg_install="sudo DEBIAN_FRONTEND=noninteractive dpkg -i --force-conflicts" sudo mkdir -p /var/run /run/php ~/php $dpkg_install ./deps/*.deb -sudo tar xJf ./php-5.3.29.tar.xz -C ~/php +sudo tar -I zstd -xf ./php-5.3.29.tar.zst -C ~/php sudo ln -sf ~/php/5.3.29/etc/php.ini /etc/php.ini \ No newline at end of file diff --git a/php-5.3/php-5.3.29.tar.xz b/php-5.3/php-5.3.29.tar.xz deleted file mode 100644 index 95d16e0..0000000 Binary files a/php-5.3/php-5.3.29.tar.xz and /dev/null differ diff --git a/php-5.3/php-5.3.29.tar.zst b/php-5.3/php-5.3.29.tar.zst new file mode 100644 index 0000000..3f5fdac Binary files /dev/null and b/php-5.3/php-5.3.29.tar.zst differ diff --git a/php-5.4/post-install.sh b/php-5.4/post-install.sh index f0818b5..3f2361b 100644 --- a/php-5.4/post-install.sh +++ b/php-5.4/post-install.sh @@ -18,4 +18,4 @@ sudo php5enmod redis sudo php5enmod xdebug echo "deb $dotdeb wheezy all" | sudo tee /etc/apt/sources.list.d/dotdeb-ubuntu-php-"$(lsb_release -s -c)".list curl -sSLO https://www.dotdeb.org/dotdeb.gpg -sudo apt-key add dotdeb.gpg +sudo DEBIAN_FRONTEND=noninteractive apt-key add dotdeb.gpg diff --git a/php-5.5/post-install.sh b/php-5.5/post-install.sh index 951128a..fc46681 100644 --- a/php-5.5/post-install.sh +++ b/php-5.5/post-install.sh @@ -18,4 +18,4 @@ sudo php5enmod redis sudo php5enmod xdebug echo "deb $dotdeb wheezy-php55 all" | sudo tee /etc/apt/sources.list.d/dotdeb-ubuntu-php-"$(lsb_release -s -c)".list curl -sSLO https://www.dotdeb.org/dotdeb.gpg -sudo apt-key add dotdeb.gpg \ No newline at end of file +sudo DEBIAN_FRONTEND=noninteractive apt-key add dotdeb.gpg \ No newline at end of file