Merge pull request #20 from shivammathur/develop

1.4.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cache-extensions",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "private": false,
   "description": "Cache extensions in GitHub Actions",
   "main": "dist/index.js",
@@ -28,22 +28,22 @@
     "@actions/exec": "^1.0.4"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.15",
+    "@types/jest": "^26.0.19",
-    "@types/node": "^14.14.10",
+    "@types/node": "^14.14.17",
-    "@typescript-eslint/eslint-plugin": "^4.8.2",
+    "@typescript-eslint/eslint-plugin": "^4.11.1",
-    "@typescript-eslint/parser": "^4.8.2",
+    "@typescript-eslint/parser": "^4.11.1",
     "@zeit/ncc": "^0.22.3",
-    "eslint": "^7.14.0",
+    "eslint": "^7.16.0",
-    "eslint-config-prettier": "^6.15.0",
+    "eslint-config-prettier": "^7.1.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jest": "^24.1.3",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-prettier": "^3.3.0",
-    "husky": "^4.3.0",
+    "husky": "^4.3.6",
     "jest": "^26.6.3",
     "jest-circus": "^26.6.3",
-    "prettier": "^2.2.0",
+    "prettier": "^2.2.1",
     "ts-jest": "^26.4.4",
-    "typescript": "^4.1.2"
+    "typescript": "^4.1.3"
   },
   "husky": {
     "skipCI": true,

src/extensions.sh

@@ -1,10 +1,8 @@
 linux_extension_dir() {
   apiv=$1
-  if [ "$version" = "5.3" ]; then
+  if [[ "$version" =~ $old_versions ]]; then
-    echo "/home/runner/php/5.3.29/lib/php/extensions/no-debug-non-zts-$apiv"
-  elif [[ "$version" =~ $old_versions ]]; then
     echo "/usr/lib/php5/$apiv"
-  elif [[ "$version" =~ $nightly_versions ]]; then
+  elif [[ "$version" =~ 5.3|$nightly_versions ]]; then
     echo "/usr/local/php/$version/lib/php/extensions/no-debug-non-zts-$apiv"
   else
     echo "/usr/lib/php/$apiv"
@@ -17,7 +15,11 @@ darwin_extension_dir() {
   if [[ "$version" =~ $old_versions_darwin ]]; then
     echo "/opt/local/lib/php${version/./}/extensions/no-debug-non-zts-$apiv"
   else
-    echo "/usr/local/lib/php/pecl/$apiv"
+    if [[ "$(sysctl -n hw.optional.arm64 2>/dev/null)" = "1" ]]; then
+      echo "/opt/homebrew/lib/php/pecl/$apiv"
+    else
+      echo "/usr/local/lib/php/pecl/$apiv"
+    fi
   fi
 }
 
@@ -74,7 +76,7 @@ key=$2
 version=$3
 os=$(uname -s)
 old_versions="5.[4-5]"
-nightly_versions="8.[0-1]"
+nightly_versions="8.[1-9]"
 if [ "$os" = "Linux" ]; then
   release=$(lsb_release -s -c)
   os=$os-$release
@@ -91,6 +93,6 @@ else
   dir='C:\\tools\\php\\ext'
 fi
 key="$os"-ext-"$version"-$(echo -n "$extensions-$key" | openssl dgst -sha256 | cut -d ' ' -f 2)
-key="$key-20201126"
+key="$key-20201231"
 echo "::set-output name=dir::$dir"
 echo "::set-output name=key::$key"

src/lists/bionic-php5.3-extensions

@@ -1,4 +1,5 @@
 [PHP Modules]
+amqp
 apc
 apcu
 bcmath
@@ -9,22 +10,28 @@ cubrid
 curl
 date
 dom
+enchant
 ereg
 exif
 fileinfo
 filter
 ftp
 gd
+gettext
+gmp
 hash
 iconv
 ioncube
 intl
 json
+ldap
 libxml
 mbstring
 mcrypt
+memcache
 memcached
 mongo
+mongodb
 mysql
 mysqli
 mysqlnd
@@ -36,9 +43,12 @@ PDO
 oci8
 PDO_OCI
 pdo_mysql
+pdo_pgsql
 pdo_sqlite
+pgsql
 Phar
 posix
+pspell
 readline
 redis
 Reflection
@@ -69,4 +79,3 @@ blackfire
 
 [Zend Modules]
 Xdebug
-

src/lists/bionic-php7.4-extensions

@@ -89,4 +89,3 @@ blackfire
 [Zend Modules]
 Xdebug
 Zend OPcache
-

src/lists/bionic-php8.0-extensions

@@ -1,4 +1,6 @@
 [PHP Modules]
+amqp
+apcu
 bcmath
 bz2
 calendar
@@ -8,6 +10,7 @@ curl
 date
 dba
 dom
+enchant
 exif
 FFI
 fileinfo
@@ -18,37 +21,43 @@ gettext
 gmp
 hash
 iconv
-ioncube
+igbinary
+imap
 intl
 json
 ldap
 libxml
 mbstring
+memcache
+memcached
+mongodb
+msgpack
 mysqli
 mysqlnd
 odbc
 openssl
 pcntl
-pcov
 pcre
 PDO
 oci8
 PDO_OCI
 pdo_dblib
+PDO_Firebird
 pdo_mysql
 PDO_ODBC
 pdo_pgsql
 pdo_sqlite
 pgsql
 Phar
-phpdbg_webhelper
 posix
 pspell
 readline
+redis
 Reflection
 session
 shmop
 SimpleXML
+snmp
 soap
 sockets
 sodium
@@ -65,13 +74,16 @@ xml
 xmlreader
 xmlwriter
 xsl
+yaml
 Zend OPcache
 zip
 zlib
+zmq
+ioncube
 phalcon3
 phalcon4
 blackfire
 
 [Zend Modules]
-Zend OPcache
 Xdebug
+Zend OPcache

src/lists/focal-php5.3-extensions

@@ -1,4 +1,5 @@
 [PHP Modules]
+amqp
 apc
 apcu
 bcmath
@@ -9,34 +10,47 @@ cubrid
 curl
 date
 dom
+enchant
 ereg
 exif
 fileinfo
 filter
 ftp
 gd
+gettext
+gmp
 hash
 iconv
 ioncube
 intl
 json
+ldap
 libxml
 mbstring
 mcrypt
+memcache
+memcached
+mongo
+mongodb
 mysql
 mysqli
 mysqlnd
 openssl
 pcntl
+pcov
 pcre
 PDO
 oci8
 PDO_OCI
 pdo_mysql
+pdo_pgsql
 pdo_sqlite
+pgsql
 Phar
 posix
+pspell
 readline
+redis
 Reflection
 session
 shmop
@@ -65,4 +79,3 @@ blackfire
 
 [Zend Modules]
 Xdebug
-

src/lists/focal-php7.4-extensions

@@ -24,7 +24,7 @@ hash
 iconv
 igbinary
 imape
-ioncub
+ioncube
 intl
 json
 ldap

src/lists/focal-php8.0-extensions

@@ -1,4 +1,6 @@
 [PHP Modules]
+amqp
+apcu
 bcmath
 bz2
 calendar
@@ -8,6 +10,7 @@ curl
 date
 dba
 dom
+enchant
 exif
 FFI
 fileinfo
@@ -18,37 +21,43 @@ gettext
 gmp
 hash
 iconv
-ioncube
+igbinary
+imap
 intl
 json
 ldap
 libxml
 mbstring
+memcache
+memcached
+mongodb
+msgpack
 mysqli
 mysqlnd
 odbc
 openssl
 pcntl
-pcov
 pcre
 PDO
 oci8
 PDO_OCI
 pdo_dblib
+PDO_Firebird
 pdo_mysql
 PDO_ODBC
 pdo_pgsql
 pdo_sqlite
 pgsql
 Phar
-phpdbg_webhelper
 posix
 pspell
 readline
+redis
 Reflection
 session
 shmop
 SimpleXML
+snmp
 soap
 sockets
 sodium
@@ -65,13 +74,16 @@ xml
 xmlreader
 xmlwriter
 xsl
+yaml
 Zend OPcache
 zip
 zlib
+zmq
+ioncube
 phalcon3
 phalcon4
 blackfire
 
 [Zend Modules]
-Zend OPcache
 Xdebug
+Zend OPcache

src/lists/xenial-php5.3-extensions

@@ -1,4 +1,5 @@
 [PHP Modules]
+amqp
 apc
 apcu
 bcmath
@@ -9,35 +10,45 @@ cubrid
 curl
 date
 dom
+enchant
 ereg
 exif
 fileinfo
 filter
 ftp
 gd
+gettext
+gmp
 hash
 iconv
 ioncube
 intl
 json
+ldap
 libxml
 mbstring
 mcrypt
+memcache
 memcached
 mongo
+mongodb
 mysql
 mysqli
 mysqlnd
 openssl
 pcntl
+pcov
 pcre
 PDO
 oci8
 PDO_OCI
 pdo_mysql
+pdo_pgsql
 pdo_sqlite
+pgsql
 Phar
 posix
+pspell
 readline
 redis
 Reflection
@@ -68,4 +79,3 @@ blackfire
 
 [Zend Modules]
 Xdebug
-

src/lists/xenial-php8.0-extensions

@@ -1,4 +1,6 @@
 [PHP Modules]
+amqp
+apcu
 bcmath
 bz2
 calendar
@@ -8,6 +10,7 @@ curl
 date
 dba
 dom
+enchant
 exif
 FFI
 fileinfo
@@ -18,37 +21,43 @@ gettext
 gmp
 hash
 iconv
-ioncube
+igbinary
+imap
 intl
 json
 ldap
 libxml
 mbstring
+memcache
+memcached
+mongodb
+msgpack
 mysqli
 mysqlnd
 odbc
 openssl
 pcntl
-pcov
 pcre
 PDO
 oci8
 PDO_OCI
 pdo_dblib
+PDO_Firebird
 pdo_mysql
 PDO_ODBC
 pdo_pgsql
 pdo_sqlite
 pgsql
 Phar
-phpdbg_webhelper
 posix
 pspell
 readline
+redis
 Reflection
 session
 shmop
 SimpleXML
+snmp
 soap
 sockets
 sodium
@@ -65,13 +74,16 @@ xml
 xmlreader
 xmlwriter
 xsl
+yaml
 Zend OPcache
 zip
 zlib
+zmq
+ioncube
 phalcon3
 phalcon4
 blackfire
 
 [Zend Modules]
-Zend OPcache
 Xdebug
+Zend OPcache