diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index ecbd22d5..7c8f3b4b 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -24,12 +24,16 @@ 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: Installing PHP with extensions and custom config
+ - 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: 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 cd3d49cb..46c26529 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.
@@ -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 and .
+- Please support on and .
## :bookmark: This action uses the following works
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/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
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-', '');
});
}
}