From 4ba36c5432033ff3f60496bc5493064a0d27dd86 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Thu, 28 Nov 2019 05:17:56 +0530 Subject: [PATCH 1/3] Shift to rotating stable tags --- .github/workflows/workflow.yml | 4 ++-- README.md | 14 +++++++------- examples/bedrock.yml | 2 +- examples/codeigniter.yml | 4 ++-- examples/laravel-mysql.yml | 2 +- examples/laravel-postgres.yml | 2 +- examples/laravel.yml | 2 +- examples/lumen-mysql.yml | 2 +- examples/lumen-postgres.yml | 2 +- examples/lumen.yml | 2 +- examples/phalcon-mysql.yml | 2 +- examples/phalcon-postgres.yml | 2 +- examples/sage.yml | 4 ++-- examples/slim-framework.yml | 4 ++-- examples/symfony-mysql.yml | 2 +- examples/symfony-postgres.yml | 2 +- examples/symfony.yml | 2 +- examples/yii2-mysql.yml | 4 ++-- examples/yii2-postgres.yml | 4 ++-- examples/zend-framework.yml | 4 ++-- 20 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 2935cf06..ca12b393 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -27,12 +27,12 @@ jobs: php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3'] steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v1 with: fetch-depth: 1 - name: Setup Node.js 12.x - uses: actions/setup-node@master + uses: actions/setup-node@v1 with: node-version: 12.x diff --git a/README.md b/README.md index 3e720529..c17b5d30 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ Specify `coverage: xdebug` to use `Xdebug`. Runs on all [PHP versions supported](#tada-php-support "List of PHP versions supported on this GitHub Action") ```yaml -uses: shivammathur/setup-php@master +uses: shivammathur/setup-php@v1 with: php-version: '7.3' coverage: xdebug @@ -85,7 +85,7 @@ If your source code directory is other than `src`, `lib` or, `app`, specify `pco ```yaml -uses: shivammathur/setup-php@master +uses: shivammathur/setup-php@v1 with: php-version: '7.3' ini-values-csv: pcov.directory=api #optional, see above for usage. @@ -102,7 +102,7 @@ Consider disabling the coverage using this PHP action for these reasons. - You are using `phpdbg` for running your tests. ```yaml -uses: shivammathur/setup-php@master +uses: shivammathur/setup-php@v1 with: php-version: '7.3' coverage: none @@ -125,10 +125,10 @@ See [action.yml](action.yml "Metadata for this GitHub Action") and usage below f ```yaml steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v1 - name: Setup PHP - uses: shivammathur/setup-php@master + uses: shivammathur/setup-php@v1 with: php-version: '7.3' extension-csv: mbstring, intl #optional, setup extensions @@ -159,10 +159,10 @@ jobs: name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }} steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v1 - name: Setup PHP - uses: shivammathur/setup-php@master + uses: shivammathur/setup-php@v1 with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, intl #optional, setup extensions diff --git a/examples/bedrock.yml b/examples/bedrock.yml index 76d6e13d..658a1787 100644 --- a/examples/bedrock.yml +++ b/examples/bedrock.yml @@ -13,7 +13,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} - name: Get composer cache directory diff --git a/examples/codeigniter.yml b/examples/codeigniter.yml index 4f935aa3..92cdec0e 100644 --- a/examples/codeigniter.yml +++ b/examples/codeigniter.yml @@ -10,9 +10,9 @@ jobs: runs-on: ${{ matrix.operating-system }} steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, intl, curl, dom diff --git a/examples/laravel-mysql.yml b/examples/laravel-mysql.yml index 74ef9a15..a4647ab6 100644 --- a/examples/laravel-mysql.yml +++ b/examples/laravel-mysql.yml @@ -36,7 +36,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, dom, fileinfo, mysql diff --git a/examples/laravel-postgres.yml b/examples/laravel-postgres.yml index ab3b3747..24bb3931 100644 --- a/examples/laravel-postgres.yml +++ b/examples/laravel-postgres.yml @@ -38,7 +38,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, dom, fileinfo, pgsql diff --git a/examples/laravel.yml b/examples/laravel.yml index 826e6b2b..af3f4ad1 100644 --- a/examples/laravel.yml +++ b/examples/laravel.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, dom, fileinfo diff --git a/examples/lumen-mysql.yml b/examples/lumen-mysql.yml index 6e545eea..0bd7cd64 100644 --- a/examples/lumen-mysql.yml +++ b/examples/lumen-mysql.yml @@ -36,7 +36,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, dom, fileinfo, mysql diff --git a/examples/lumen-postgres.yml b/examples/lumen-postgres.yml index 1a6138de..850003c8 100644 --- a/examples/lumen-postgres.yml +++ b/examples/lumen-postgres.yml @@ -38,7 +38,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, dom, fileinfo, pgsql diff --git a/examples/lumen.yml b/examples/lumen.yml index bf7d03b2..f43bfa1b 100644 --- a/examples/lumen.yml +++ b/examples/lumen.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, dom, fileinfo, mysql diff --git a/examples/phalcon-mysql.yml b/examples/phalcon-mysql.yml index 516fb823..e7d24cda 100644 --- a/examples/phalcon-mysql.yml +++ b/examples/phalcon-mysql.yml @@ -34,7 +34,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, dom, zip, phalcon4, mysql #use phalcon3 for the phalcon 3.x. diff --git a/examples/phalcon-postgres.yml b/examples/phalcon-postgres.yml index 5dafa83f..f64dd3bd 100644 --- a/examples/phalcon-postgres.yml +++ b/examples/phalcon-postgres.yml @@ -35,7 +35,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, dom, zip, phalcon4, pgsql #use phalcon3 for the phalcon 3.x diff --git a/examples/sage.yml b/examples/sage.yml index 84d3c212..59bc6587 100644 --- a/examples/sage.yml +++ b/examples/sage.yml @@ -14,11 +14,11 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup Node.js - uses: actions/setup-node@master + uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-versions }} - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring diff --git a/examples/slim-framework.yml b/examples/slim-framework.yml index 53c84c58..3f6c2020 100644 --- a/examples/slim-framework.yml +++ b/examples/slim-framework.yml @@ -10,9 +10,9 @@ jobs: runs-on: ${{ matrix.operating-system }} steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, simplexml, dom diff --git a/examples/symfony-mysql.yml b/examples/symfony-mysql.yml index b2304a3c..c1b2806f 100644 --- a/examples/symfony-mysql.yml +++ b/examples/symfony-mysql.yml @@ -23,7 +23,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, xml, ctype, iconv, mysql diff --git a/examples/symfony-postgres.yml b/examples/symfony-postgres.yml index e2774a4c..092f5395 100644 --- a/examples/symfony-postgres.yml +++ b/examples/symfony-postgres.yml @@ -23,7 +23,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, xml, ctype, iconv, pgsql diff --git a/examples/symfony.yml b/examples/symfony.yml index c46ece7b..15c75850 100644 --- a/examples/symfony.yml +++ b/examples/symfony.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, xml, ctype, iconv diff --git a/examples/yii2-mysql.yml b/examples/yii2-mysql.yml index dacf8b65..e8e1a2cf 100644 --- a/examples/yii2-mysql.yml +++ b/examples/yii2-mysql.yml @@ -29,11 +29,11 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Set Node.js 10.x - uses: actions/setup-node@master + uses: actions/setup-node@v1 with: node-version: 10.x - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, intl, gd, imagick, zip, dom, mysql diff --git a/examples/yii2-postgres.yml b/examples/yii2-postgres.yml index d8f6c0c7..7c21cb78 100644 --- a/examples/yii2-postgres.yml +++ b/examples/yii2-postgres.yml @@ -29,11 +29,11 @@ jobs: - name: Checkout uses: actions/checkout@v1 - name: Set Node.js 10.x - uses: actions/setup-node@master + uses: actions/setup-node@v1 with: node-version: 10.x - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, intl, gd, imagick, zip, dom, pgsql diff --git a/examples/zend-framework.yml b/examples/zend-framework.yml index 2d34a3c9..459368a4 100644 --- a/examples/zend-framework.yml +++ b/examples/zend-framework.yml @@ -10,9 +10,9 @@ jobs: runs-on: ${{ matrix.operating-system }} steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v1 - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master #https://github.com/shivammathur/setup-php + uses: shivammathur/setup-php@v1 #https://github.com/shivammathur/setup-php with: php-version: ${{ matrix.php-versions }} extension-csv: mbstring, bcmath, curl, intl From de68427afb3866b4c100fc35487409d901f51812 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Thu, 28 Nov 2019 06:10:27 +0530 Subject: [PATCH 2/3] Bump to 7.4.0 stable on windows and macOS --- package-lock.json | 28 +++++++++++++++++++++------- src/scripts/7.4.sh | 5 +++-- src/scripts/win32.ps1 | 4 +--- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4817f005..d5330589 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2249,12 +2249,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2269,17 +2271,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2396,7 +2401,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2408,6 +2414,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2422,6 +2429,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2429,12 +2437,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2453,6 +2463,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2533,7 +2544,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2545,6 +2557,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2666,6 +2679,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/src/scripts/7.4.sh b/src/scripts/7.4.sh index 71661cfb..723dcaac 100644 --- a/src/scripts/7.4.sh +++ b/src/scripts/7.4.sh @@ -16,7 +16,7 @@ add_log() { printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message" fi } -version='7.4.0RC6' +version='7.4.0' step_log "Setup dependencies" for package in pkg-config autoconf bison re2c openssl@1.1 krb5 enchant libffi freetype intltool icu4c libiconv t1lib gd libzip gmp tidyp libxml2 libxslt postgresql curl; do @@ -78,13 +78,14 @@ source ~/.bash_profile >/dev/null 2>&1 source ~/.bashrc >/dev/null 2>&1 step_log "Setup PHP and Composer" -phpbrew install -j 6 $version +dev >/dev/null 2>&1 +phpbrew install -j 6 github:php/php-src@PHP-$version as php-$version +dev >/dev/null 2>&1 phpbrew switch $version sudo ln -sf /opt/phpbrew/php/php-$version/bin/* /usr/local/bin/ sudo ln -sf /opt/phpbrew/php/php-$version/etc/php.ini /etc/php.ini ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g") ext_dir=$(php -i | grep "extension_dir => /opt" | sed -e "s|.*=> s*||") pecl config-set php_ini "$ini_file" >/dev/null 2>&1 +pear config-set php_ini "$ini_file" >/dev/null 2>&1 sudo chmod 777 "$ini_file" brew install composer >/dev/null 2>&1 diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1 index d8a621a5..0ba5b11e 100644 --- a/src/scripts/win32.ps1 +++ b/src/scripts/win32.ps1 @@ -33,9 +33,7 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version if ($version -lt '7.0') { Install-Module -Name VcRedist -Force } - if ($version -eq '7.4') { - $version = '7.4RC' - } + Install-Php -Version $version -Architecture x86 -ThreadSafe $true -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force >$null 2>&1 $installed = Get-Php -Path $php_dir $status = "Installed PHP $($installed.FullVersion)" From 46161660dc3b7a39164aa6f382f40ae37d5e42c5 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Thu, 28 Nov 2019 15:58:33 +0530 Subject: [PATCH 3/3] Bump to 7.4.0 stable on linux --- README.md | 2 +- src/scripts/linux.sh | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index c17b5d30..f325eece 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Setup PHP with required extensions, php.ini configuration and composer in [GitHu |7.1|`Stable`|`Security fixes only`| |7.2|`Stable`|`Active`| |7.3|`Stable`|`Active`| -|7.4|`RC6`|`Active`| +|7.4|`Stable`|`Active`| ## :cloud: OS/Platform Support diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh index c775a32b..31b1e044 100644 --- a/src/scripts/linux.sh +++ b/src/scripts/linux.sh @@ -25,11 +25,7 @@ sudo mkdir -p /run/php find /etc/apt/sources.list.d -type f -name 'ondrej-ubuntu-php*.list' -exec sudo DEBIAN_FRONTEND=noninteractive apt-fast update -o Dir::Etc::sourcelist="{}" ';' >/dev/null 2>&1 if [ "$existing_version" != "$1" ]; then if [ ! -e "/usr/bin/php$1" ]; then - if [ "$1" != "7.4" ]; then - sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1" curl php"$1"-curl >/dev/null 2>&1 - else - sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1" php"$1"-dev php"$1"-xml curl php"$1"-curl >/dev/null 2>&1 - fi + sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1" curl php"$1"-curl >/dev/null 2>&1 status="Installed PHP$version" fi @@ -45,9 +41,7 @@ ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||") sudo chmod 777 "$ini_file" add_log "$tick" "PHP" "$status" if [ "$2" = "true" ]; then - if [ "$1" != "7.4" ]; then - sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1"-dev php"$1"-xml >/dev/null 2>&1 - fi + sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php"$1"-dev php"$1"-xml >/dev/null 2>&1 sudo update-alternatives --set php-config /usr/bin/php-config"$1" >/dev/null 2>&1 sudo update-alternatives --set phpize /usr/bin/phpize"$1" >/dev/null 2>&1 wget https://github.com/pear/pearweb_phars/raw/master/install-pear-nozlib.phar >/dev/null 2>&1