From 8d9a12ba845b2adb588f4bf08f64fee2eb8460cc Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Sat, 19 Oct 2019 11:09:31 +0530 Subject: [PATCH 1/4] PHP7.4 RC4 on windows and macOS --- README.md | 2 +- src/scripts/7.4.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cd3d49cb..5698ec69 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,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|`RC3`|`Active`| +|7.4|`RC3`/`RC4`|`Active`| **Note:** PHP 7.4 is currently in development, do not use in production/release branches. diff --git a/src/scripts/7.4.sh b/src/scripts/7.4.sh index a767d607..77e2cb1d 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.0RC3' +version='7.4.0RC4' 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 From 46f009cce1f52f7a5858e56e5216ed17f186e0e1 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Sat, 19 Oct 2019 19:29:29 +0530 Subject: [PATCH 2/4] Fix installation of extensions with pdo prefix --- .github/workflows/workflow.yml | 2 +- lib/utils.js | 4 +++- src/utils.ts | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index ecbd22d5..b58809df 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -33,7 +33,7 @@ jobs: run: node lib/install.js env: php-version: ${{ matrix.php-versions }} - extension-csv: mbstring, xdebug, pcov #optional + extension-csv: mbstring, xdebug, pcov, pdo_mysql #optional ini-values-csv: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata #optional - name: Testing PHP version diff --git a/lib/utils.js b/lib/utils.js index e1a53901..4ba6f6a2 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -139,7 +139,9 @@ function extensionArray(extension_csv) { return extension .trim() .replace('php-', '') - .replace('php_', ''); + .replace('php_', '') + .replace('pdo_', '') + .replace('pdo-', ''); }); } }); diff --git a/src/utils.ts b/src/utils.ts index c01ec16b..05c0856c 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -140,7 +140,9 @@ export async function extensionArray( return extension .trim() .replace('php-', '') - .replace('php_', ''); + .replace('php_', '') + .replace('pdo_', '') + .replace('pdo-', ''); }); } } From 0ac43c03b2f126a60723319f3b0b1d0b07bd54f3 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Sat, 19 Oct 2019 19:41:49 +0530 Subject: [PATCH 3/4] Add timeout to codecov step in the workflow --- .github/workflows/workflow.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index b58809df..3b1bba8e 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -24,16 +24,20 @@ jobs: - name: Installing NPM packages run: npm install - - name: Run tests and send coverage - run: | - npm test - curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }} + - name: Run tests + run: npm test + + - name: Send Coverage + continue-on-error: true + timeout-minutes: 2 + shell: pwsh + run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }} - name: Installing PHP with extensions and custom config run: node lib/install.js env: php-version: ${{ matrix.php-versions }} - extension-csv: mbstring, xdebug, pcov, pdo_mysql #optional + extension-csv: mbstring, xdebug, pcov #optional ini-values-csv: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata #optional - name: Testing PHP version From 9145972d5ce3754bc4fbfa760a2f090cef940c81 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Sat, 19 Oct 2019 19:59:48 +0530 Subject: [PATCH 4/4] Edit README and the test workflow --- .github/workflows/workflow.yml | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 3b1bba8e..7c8f3b4b 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -33,7 +33,7 @@ jobs: shell: pwsh run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }} - - name: Installing PHP with extensions and custom config + - name: Setup PHP with extensions and custom config run: node lib/install.js env: php-version: ${{ matrix.php-versions }} diff --git a/README.md b/README.md index 5698ec69..46c26529 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ See [action.yml](action.yml "Metadata for this GitHub Action") and usage below f steps: - name: Checkout uses: actions/checkout@master -- name: Installing PHP +- name: Setup PHP uses: shivammathur/setup-php@master with: php-version: '7.3' @@ -138,7 +138,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@master - - name: Install PHP + - name: Setup PHP uses: shivammathur/setup-php@master with: php-version: ${{ matrix.php-versions }} @@ -186,7 +186,7 @@ Contributions are welcome! See [Contributor's Guide](.github/CONTRIBUTING.md "sh ## :sparkling_heart: Support this project - Please star the project and share it. -- Consider supporting on Support me on Patreon and Support me on Paypal. +- Please support on Support me on Patreon and Support me on Paypal. ## :bookmark: This action uses the following works