From 3579c7ef2894b9e3897dfafeb1eeed48933db5f2 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Mon, 17 Feb 2020 03:46:26 +0530 Subject: [PATCH] v1 maintenance release --- .github/workflows/experimental-workflow.yml | 10 +- .github/workflows/workflow.yml | 8 +- action.yml | 7 +- dist/index.js | 7 +- package-lock.json | 185 ++++++++++---------- package.json | 18 +- src/extensions.ts | 7 +- src/scripts/darwin.sh | 30 ++-- src/scripts/ext/extensions.sh | 15 -- src/scripts/ext/phalcon_darwin.sh | 40 ++++- update.zip | Bin 2879 -> 0 bytes 11 files changed, 164 insertions(+), 163 deletions(-) delete mode 100644 src/scripts/ext/extensions.sh delete mode 100644 update.zip diff --git a/.github/workflows/experimental-workflow.yml b/.github/workflows/experimental-workflow.yml index e1816394..1f1ce335 100644 --- a/.github/workflows/experimental-workflow.yml +++ b/.github/workflows/experimental-workflow.yml @@ -2,19 +2,13 @@ name: Experimental workflow on: pull_request: branches: - - nightly - - master - - develop - - verbose + - releases/v1 paths-ignore: - '**.md' - 'examples/**' push: branches: - - nightly - - master - - develop - - verbose + - releases/v1 paths-ignore: - '**.md' - 'examples/**' diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 35927cc6..8a3a24ce 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -2,17 +2,13 @@ name: Main workflow on: pull_request: branches: - - master - - develop - - verbose + - releases/v1 paths-ignore: - '**.md' - 'examples/**' push: branches: - - master - - develop - - verbose + - releases/v1 paths-ignore: - '**.md' - 'examples/**' diff --git a/action.yml b/action.yml index cabc7b4f..75ca0f3c 100644 --- a/action.yml +++ b/action.yml @@ -20,18 +20,17 @@ inputs: tools: description: 'Setup popular tools globally.' required: false - # Deprecated options, do not use. Will not be supported in v2 which will be released around February 1, 2020. extension-csv: description: 'Deprecated! Use extensions instead.' - deprecationMessage: 'The extension-csv property will not be supported in v2. Use extensions instead.' + deprecationMessage: 'The extension-csv property is deprecated. Use extensions instead.' required: false ini-values-csv: description: 'Deprecated! Use ini-values instead.' - deprecationMessage: 'The ini-values-csv property will not be supported in v2. Use ini-values instead.' + deprecationMessage: 'The ini-values-csv property is deprecated. Use ini-values instead.' required: false pecl: description: 'Deprecated! Use tools instead to setup PECL.' - deprecationMessage: 'The pecl property will not be supported in v2. Specify pecl in tools instead.' + deprecationMessage: 'The pecl property is deprecated. Specify pecl in tools instead.' required: false runs: using: 'node12' diff --git a/dist/index.js b/dist/index.js index 5525fcea..97f8117d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2680,15 +2680,14 @@ function addExtensionDarwin(extension_csv, version, pipe) { pipe; break; case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension): - install_command = + script += 'sh ' + path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') + ' ' + extension + ' ' + - version + - pipe; - break; + version; + return; default: install_command = 'sudo pecl install -f ' + extension + pipe; break; diff --git a/package-lock.json b/package-lock.json index 860ea479..641dda46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "setup-php", - "version": "1.8.2", + "version": "1.8.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -284,9 +284,9 @@ "dev": true }, "@cnakazawa/watch": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz", - "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", + "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==", "dev": true, "requires": { "exec-sh": "^0.3.2", @@ -425,9 +425,9 @@ }, "dependencies": { "rimraf": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.1.tgz", - "integrity": "sha512-IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { "glob": "^7.1.3" @@ -584,9 +584,9 @@ } }, "@types/babel__core": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz", - "integrity": "sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.4.tgz", + "integrity": "sha512-c/5MuRz5HM4aizqL5ViYfW4iEnmfPcfbH4Xa6GgLT21dMc1NGeNnuS6egHheOmP+kCJ9CAzC4pv4SDCWTnRkbg==", "dev": true, "requires": { "@babel/parser": "^7.1.0", @@ -662,9 +662,9 @@ } }, "@types/jest": { - "version": "25.1.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.1.1.tgz", - "integrity": "sha512-bKSZJYZJLzwaoVYNN4W3A0RvKNYsrLm5tsuXaMlfYDxKf4gY2sFrMYneCugNQWGg1gjPW+FHBwNrwPzEi4sIsw==", + "version": "25.1.2", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.1.2.tgz", + "integrity": "sha512-EsPIgEsonlXmYV7GzUqcvORsSS9Gqxw/OvkGwHfAdpjduNRxMlhsav0O5Kb0zijc/eXSO/uW6SJt9nwull8AUQ==", "dev": true, "requires": { "jest-diff": "^25.1.0", @@ -678,9 +678,9 @@ "dev": true }, "@types/node": { - "version": "13.7.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.0.tgz", - "integrity": "sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==", + "version": "13.7.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz", + "integrity": "sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==", "dev": true }, "@types/parse-json": { @@ -711,12 +711,12 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.18.0.tgz", - "integrity": "sha512-kuO8WQjV+RCZvAXVRJfXWiJ8iYEtfHlKgcqqqXg9uUkIolEHuUaMmm8/lcO4xwCOtaw6mY0gStn2Lg4/eUXXYQ==", + "version": "2.19.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.19.2.tgz", + "integrity": "sha512-HX2qOq2GOV04HNrmKnTpSIpHjfl7iwdXe3u/Nvt+/cpmdvzYvY0NHSiTkYN257jHnq4OM/yo+OsFgati+7LqJA==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "2.18.0", + "@typescript-eslint/experimental-utils": "2.19.2", "eslint-utils": "^1.4.3", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", @@ -724,32 +724,32 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.18.0.tgz", - "integrity": "sha512-J6MopKPHuJYmQUkANLip7g9I82ZLe1naCbxZZW3O2sIxTiq/9YYoOELEKY7oPg0hJ0V/AQ225h2z0Yp+RRMXhw==", + "version": "2.19.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.19.2.tgz", + "integrity": "sha512-B88QuwT1wMJR750YvTJBNjMZwmiPpbmKYLm1yI7PCc3x0NariqPwqaPsoJRwU9DmUi0cd9dkhz1IqEnwfD+P1A==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.18.0", + "@typescript-eslint/typescript-estree": "2.19.2", "eslint-scope": "^5.0.0" } }, "@typescript-eslint/parser": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.18.0.tgz", - "integrity": "sha512-SJJPxFMEYEWkM6pGfcnjLU+NJIPo+Ko1QrCBL+i0+zV30ggLD90huEmMMhKLHBpESWy9lVEeWlQibweNQzyc+A==", + "version": "2.19.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.19.2.tgz", + "integrity": "sha512-8uwnYGKqX9wWHGPGdLB9sk9+12sjcdqEEYKGgbS8A0IvYX59h01o8os5qXUHMq2na8vpDRaV0suTLM7S8wraTA==", "dev": true, "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.18.0", - "@typescript-eslint/typescript-estree": "2.18.0", + "@typescript-eslint/experimental-utils": "2.19.2", + "@typescript-eslint/typescript-estree": "2.19.2", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.18.0.tgz", - "integrity": "sha512-gVHylf7FDb8VSi2ypFuEL3hOtoC4HkZZ5dOjXvVjoyKdRrvXAOPSzpNRnKMfaUUEiSLP8UF9j9X9EDLxC0lfZg==", + "version": "2.19.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.19.2.tgz", + "integrity": "sha512-Xu/qa0MDk6upQWqE4Qy2X16Xg8Vi32tQS2PR0AvnT/ZYS4YGDvtn2MStOh5y8Zy2mg4NuL06KUHlvCh95j9C6Q==", "dev": true, "requires": { "debug": "^4.1.1", @@ -762,9 +762,9 @@ } }, "@zeit/ncc": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.21.0.tgz", - "integrity": "sha512-RUMdvVK/w78oo+yBjruZltt0kJXYar2un/1bYQ2LuHG7GmFVm+QjxzEmySwREctaJdEnBvlMdUNWd9hXHxEI3g==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.21.1.tgz", + "integrity": "sha512-M9WzgquSOt2nsjRkYM9LRylBLmmlwNCwYbm3Up3PDEshfvdmIfqpFNSK8EJvR18NwZjGHE5z2avlDtYQx2JQnw==", "dev": true }, "abab": { @@ -1324,9 +1324,9 @@ } }, "compare-versions": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz", - "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz", + "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==", "dev": true }, "component-emitter": { @@ -1649,9 +1649,9 @@ "dev": true }, "escodegen": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.13.0.tgz", - "integrity": "sha512-eYk2dCkxR07DsHA/X2hRBj0CFAZeri/LyDMc0C8JT1Hqi6JnVpMhJ7XFITbb0+yZS3lVkaPL2oCkZ3AVmeVbMw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz", + "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==", "dev": true, "requires": { "esprima": "^4.0.1", @@ -1875,13 +1875,12 @@ } }, "eslint-plugin-jest": { - "version": "23.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.6.0.tgz", - "integrity": "sha512-GH8AhcFXspOLqak7fqnddLXEJsrFyvgO8Bm60SexvKSn1+3rWYESnCiWUOCUcBTprNSDSE4CtAZdM4EyV6gPPw==", + "version": "23.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.7.0.tgz", + "integrity": "sha512-zkiyGlvJeHNjAEz8FaIxTXNblJJ/zj3waNbYbgflK7K6uy0cpE5zJBt/JpJtOBGM/UGkC6BqsQ4n0y7kQ2HA8w==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "^2.5.0", - "micromatch": "^4.0.2" + "@typescript-eslint/experimental-utils": "^2.5.0" } }, "eslint-plugin-prettier": { @@ -1936,9 +1935,9 @@ "dev": true }, "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz", + "integrity": "sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==", "dev": true, "requires": { "estraverse": "^4.0.0" @@ -2199,9 +2198,9 @@ } }, "figures": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", - "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, "requires": { "escape-string-regexp": "^1.0.5" @@ -2537,9 +2536,9 @@ "dev": true }, "husky": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/husky/-/husky-4.2.1.tgz", - "integrity": "sha512-Qa0lRreeIf4Tl92sSs42ER6qc3hzoyQPPorzOrFWfPEVbdi6LuvJEqWKPk905fOWIR76iBpp7ECZNIwk+a8xuQ==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/husky/-/husky-4.2.3.tgz", + "integrity": "sha512-VxTsSTRwYveKXN4SaH1/FefRJYCtx+wx04sSVcOpD7N2zjoHxa+cEJ07Qg5NmV3HAK+IRKOyNVpi2YBIVccIfQ==", "dev": true, "requires": { "chalk": "^3.0.0", @@ -3036,9 +3035,9 @@ "dev": true }, "istanbul-lib-instrument": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.0.tgz", - "integrity": "sha512-Nm4wVHdo7ZXSG30KjZ2Wl5SU/Bw7bDx1PdaiIFzEStdjs0H12mOTncn1GVYuqQSaZxpg87VGBRsVRPGD2cD1AQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz", + "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==", "dev": true, "requires": { "@babel/core": "^7.7.5", @@ -3557,9 +3556,9 @@ }, "dependencies": { "semver": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.2.tgz", - "integrity": "sha512-BJs9T/H8sEVHbeigqzIEo57Iu/3DG6c4QoqTfbQB3BPA4zgzAomh/Fk9E7QtjWQ8mx2dgA9YCfSF4y9k9bHNpQ==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz", + "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==", "dev": true } } @@ -3819,9 +3818,9 @@ } }, "make-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz", - "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz", + "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==", "dev": true, "requires": { "semver": "^6.0.0" @@ -4390,13 +4389,13 @@ "dev": true }, "prompts": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz", - "integrity": "sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz", + "integrity": "sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==", "dev": true, "requires": { "kleur": "^3.0.3", - "sisteransi": "^1.0.3" + "sisteransi": "^1.0.4" } }, "psl": { @@ -4504,9 +4503,9 @@ "dev": true }, "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -4516,7 +4515,7 @@ "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", - "har-validator": "~5.1.0", + "har-validator": "~5.1.3", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", @@ -4526,25 +4525,19 @@ "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", + "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" }, "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - }, "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "dev": true, "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" + "psl": "^1.1.28", + "punycode": "^2.1.1" } } } @@ -4594,9 +4587,9 @@ "dev": true }, "resolve": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz", - "integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", + "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -5350,9 +5343,9 @@ } }, "supports-hyperlinks": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.0.0.tgz", - "integrity": "sha512-bFhn0MQ8qefLyJ3K7PpHiPUTuTVPWw6RXfaMeV6xgJLXtBbszyboz1bvGTVv4R0YpQm2DqlXXn0fFHhxUHVE5w==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz", + "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==", "dev": true, "requires": { "has-flag": "^4.0.0", @@ -5524,9 +5517,9 @@ } }, "ts-jest": { - "version": "25.1.0", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.1.0.tgz", - "integrity": "sha512-1Lf576ulKhbxX5og+tG8udVg/5cgcMLPBxp1iCqbbf6VvUK4gEsgAtzMjl8u98izhLrzKMPB0LxCBKEZ5l19Hw==", + "version": "25.2.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.2.0.tgz", + "integrity": "sha512-VaRdb0da46eorLfuHEFf0G3d+jeREcV+Wb/SvW71S4y9Oe8SHWU+m1WY/3RaMknrBsnvmVH0/rRjT8dkgeffNQ==", "dev": true, "requires": { "bs-logger": "0.x", @@ -5728,9 +5721,9 @@ "dev": true }, "v8-to-istanbul": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.0.1.tgz", - "integrity": "sha512-x0yZvZAkjJwdD3fPiJzYP37aod0ati4LlmD2RmpKjqewjKAov/u/ytZ8ViIZb07cN4cePKzl9ijiUi7C1LQ8hQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.2.tgz", + "integrity": "sha512-G9R+Hpw0ITAmPSr47lSlc5A1uekSYzXxTMlFxso2xoffwo4jQnzbv1p9yXIinO8UMZKfAFewaCHwWvnH4Jb4Ug==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.1", diff --git a/package.json b/package.json index 1ffed5cb..d05d129f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "setup-php", - "version": "1.8.2", + "version": "1.8.3", "private": false, "description": "Setup PHP for use with GitHub Actions", "main": "dist/index.js", @@ -30,21 +30,21 @@ "fs": "0.0.1-security" }, "devDependencies": { - "@types/jest": "^25.1.1", - "@types/node": "^13.7.0", - "@typescript-eslint/eslint-plugin": "^2.18.0", - "@typescript-eslint/parser": "^2.18.0", - "@zeit/ncc": "^0.21.0", + "@types/jest": "^25.1.2", + "@types/node": "^13.7.1", + "@typescript-eslint/eslint-plugin": "^2.19.2", + "@typescript-eslint/parser": "^2.19.2", + "@zeit/ncc": "^0.21.1", "eslint": "^6.8.0", "eslint-config-prettier": "^6.10.0", "eslint-plugin-import": "^2.20.1", - "eslint-plugin-jest": "^23.6.0", + "eslint-plugin-jest": "^23.7.0", "eslint-plugin-prettier": "^3.1.2", - "husky": "^4.2.1", + "husky": "^4.2.3", "jest": "^25.1.0", "jest-circus": "^25.1.0", "prettier": "^1.19.1", - "ts-jest": "^25.1.0", + "ts-jest": "^25.2.0", "typescript": "^3.7.5" }, "husky": { diff --git a/src/extensions.ts b/src/extensions.ts index 86cb4144..18467545 100644 --- a/src/extensions.ts +++ b/src/extensions.ts @@ -49,15 +49,14 @@ export async function addExtensionDarwin( pipe; break; case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension): - install_command = + script += 'sh ' + path.join(__dirname, '../src/scripts/ext/phalcon_darwin.sh') + ' ' + extension + ' ' + - version + - pipe; - break; + version; + return; default: install_command = 'sudo pecl install -f ' + extension + pipe; break; diff --git a/src/scripts/darwin.sh b/src/scripts/darwin.sh index d2972565..cbd4088e 100644 --- a/src/scripts/darwin.sh +++ b/src/scripts/darwin.sh @@ -96,12 +96,13 @@ add_tool() { if [ "$status_code" = "200" ]; then sudo chmod a+x "$tool_path" if [ "$tool" = "phive" ]; then - add_extension curl >/dev/null 2>&1 - add_extension mbstring >/dev/null 2>&1 - add_extension xml >/dev/null 2>&1 + add_extension curl "sudo pecl install -f curl" extension >/dev/null 2>&1 + add_extension mbstring "sudo pecl install -f mbstring" extension >/dev/null 2>&1 + add_extension xml "sudo pecl install -f xml" extension >/dev/null 2>&1 elif [ "$tool" = "cs2pr" ]; then sudo sed -i '' 's/exit(9)/exit(0)/' "$tool_path" - tr -d '\r' < "$tool_path" | sudo tee "$tool_path" >/dev/null 2>&1 + tr -d '\r' < "$tool_path" | sudo tee "$tool_path.tmp" >/dev/null 2>&1 && sudo mv "$tool_path.tmp" "$tool_path" + sudo chmod a+x "$tool_path" fi add_log "$tick" "$tool" "Added" else @@ -148,15 +149,24 @@ setup_php_and_composer() { tick="✓" cross="✗" version=$1 +existing_version=$(php-config --version | cut -c 1-3) -# Setup PHP and composer +# Setup PHP step_log "Setup PHP" -setup_php_and_composer +if [ "$existing_version" != "$version" ]; then + export HOMEBREW_NO_INSTALL_CLEANUP=TRUE >/dev/null 2>&1 + brew tap shivammathur/homebrew-php >/dev/null 2>&1 + brew install shivammathur/php/php@"$version" >/dev/null 2>&1 + brew link --force --overwrite php@"$version" >/dev/null 2>&1 + status="Installed" +else + status="Found" +fi ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g") -echo "date.timezone=UTC" >>"$ini_file" -ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||") sudo chmod 777 "$ini_file" -mkdir -p "$(pecl config-get ext_dir)" +echo "date.timezone=UTC" >>"$ini_file" +ext_dir=$(php -i | grep -Ei "extension_dir => /(usr|opt)" | sed -e "s|.*=> s*||") +sudo mkdir -p "$ext_dir" semver=$(php -v | head -n 1 | cut -f 2 -d ' ') -add_log "$tick" "PHP" "Installed PHP $semver" configure_pecl +add_log "$tick" "PHP" "$status PHP $semver" diff --git a/src/scripts/ext/extensions.sh b/src/scripts/ext/extensions.sh deleted file mode 100644 index af88bcae..00000000 --- a/src/scripts/ext/extensions.sh +++ /dev/null @@ -1,15 +0,0 @@ -php_h="https://raw.githubusercontent.com/php/php-src/PHP-$2/main/php.h" -os=$(uname -s) -if [ "$os" = "Linux" ]; then - apiv=$(curl -sSL --retry 5 "$php_h" | grep "PHP_API_VERSION" | cut -d' ' -f 3) - dir="/usr/lib/php/$apiv" - sudo mkdir -p "$dir" && sudo chown -R "$USER":"$(id -g -n)" /usr/lib/php -elif [ "$os" = "Darwin" ]; then - apiv=$(curl -sSL --retry 5 "$php_h" | grep "PHP_API_VERSION" | cut -d' ' -f 3) - dir="/usr/local/lib/php/pecl/$apiv" -else - dir='C:\\tools\\php\\ext' -fi -hash=$(echo -n "$1" | openssl dgst -sha256 | cut -d ' ' -f 2) -echo "::set-output name=ext_dir::$dir" -echo "::set-output name=ext_hash::$hash" \ No newline at end of file diff --git a/src/scripts/ext/phalcon_darwin.sh b/src/scripts/ext/phalcon_darwin.sh index 8869c304..7f894453 100644 --- a/src/scripts/ext/phalcon_darwin.sh +++ b/src/scripts/ext/phalcon_darwin.sh @@ -1,17 +1,43 @@ +# Function to log result of a operation +add_log() { + mark=$1 + subject=$2 + message=$3 + if [ "$mark" = "$tick" ]; then + printf "\033[32;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message" + else + printf "\033[31;1m%s \033[0m\033[34;1m%s \033[0m\033[90;1m%s\033[0m\n" "$mark" "$subject" "$message" + fi +} + +# Function to install phalcon +install_phalcon() { + ( + brew tap shivammathur/homebrew-phalcon >/dev/null 2>&1 + brew install phalcon@"$php_version"_"$extension_major" >/dev/null 2>&1 + sudo cp /usr/local/opt/psr@"$php_version"/psr.so "$ext_dir" >/dev/null 2>&1 + sudo cp /usr/local/opt/phalcon@"$php_version"_"$extension_major"/phalcon.so "$ext_dir" >/dev/null 2>&1 + add_log "$tick" "$extension" "Installed and enabled" + ) || add_log "$cross" "$extension" "Could not install $extension on PHP $semver" +} + +tick="✓" +cross="✗" extension=$1 extension_major=${extension: -1} php_version=$2 +semver=$(php -v | head -n 1 | cut -f 2 -d ' ') ini_file=$(php -d "date.timezone=UTC" --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g") ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||") if [ -e "$ext_dir/psr.so" ] && [ -e "$ext_dir/phalcon.so" ]; then - echo "extension=psr" >>"$ini_file" - echo "extension=phalcon" >>"$ini_file" - phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1) + phalcon_version=$(php -d="extension=psr.so" -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1) if [ "$phalcon_version" != "$extension_major" ]; then - brew tap shivammathur/homebrew-phalcon - brew install phalcon@"$php_version"_"$extension_major" + install_phalcon + else + echo "extension=psr.so" >>"$ini_file" + echo "extension=phalcon.so" >>"$ini_file" + add_log "$tick" "$extension" "Enabled" fi else - brew tap shivammathur/homebrew-phalcon - brew install phalcon@"$php_version"_"$extension_major" + install_phalcon fi \ No newline at end of file diff --git a/update.zip b/update.zip deleted file mode 100644 index f4bdf08b816208cb1f1bda937d628e267182638b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2879 zcma);c{o&k8^>qHSW=jJVhoxP*~idWvt?dSVw5IIVPqLbA~U0G*|J61WgTNn2qQ@` zNVZb8NR2%vTXqqZ@bc92)Z3f)dVl9S=eqy+eLv^Ee%Jjy=WA@p0_Fs4ErXl7#(x#x zA7H=^0GVVfZ)(B{05;H-amL$j-SvGd*_Pz!>PG&5B#>Vucn`P#mT~;m)DTtbv@r_+ zAg}`f5d4kIm0*3*_L2+2m8|ejuhpi`mzaM-)*~DIlIV}?kJ++E=FOZWc3K+Dii(3- z5o>^^M@b^MM%-%E6w2|1-(2Baf89Zo{Ppv14$H5$w3PC&B;11(dT~v_c$T2jn8G7s z70eia1d3;f5~gETC2g2c`DLMrwI*noMa2sH2HRS8v4LtT29ce4H{6<1E*B@QyhKmF4AJj4NRH z2F00pz#zOpD7Hk{Ka1v7q(~j(^Nuzz)bwatTwpaTP#+LI-2G{vKv!a?k#>O)k=Gc` zx~vA(z|?2j9D=)E<{8o037H0-(n>1XUrDBp^d$HPG<@v02ksm1s%_6(5;=@M{7Lfd}9e(xE3Do7C0RW8p1zTW2l|s??jw1YYT9%~f{45lbPj{i)`1 zJgxm${8LhYiaIRwjl^eq)|qGB(0uidou!PLNekbZ74O8^2_~~ebKT=>j*1j#m;Nvd zSGXk4oK}@{QQPc5qubf(sIc+HzHoTEL#dwx#R6$G4sG!F*&`0u0%b+{_2zP-n+CI2 z`K>+nw`KWzJ6QC`=Mms3o`1AH+0#sk?KzNOk?qA+ce?uk*X}P=Lfy(;bNtFf`EHtb z{6<5AN*Tbm^WvjtmqsoX%|`@HXT$8ZXR>FiS6W*&t^GTE9ip!i=j@HXJW(y89pvIh z1|F8!gD3-x&RX7kN^OsQUtIGbRSd&QB-9Mc@HV#%4=bJVRVPeJACW{crDob0o>gG}@UG6A zJ8Sv`JYj>!=jpxT@2A0@-f zUar2+Ux1vc3AnGpCk-NX&VG#a9ysFg0eh|Ifkck8`>SQT^Tk`oqSZKw7j>VS*rQQ< zPKecTl`JwK+2y#(e8yy15pTi`S-Wtwa+`3oS@r4Jqvf>jvIm)X6L?5S^>ynVPSbiN z9JTMH=gsbDB=dPb!OMi@TnN^AZTeIMB;6epm>P~8hdxl136hp%&ha0GO4f`3l@&3= zYx6U;sr4P}xly6%p`mj=F`QyM@&4~ms0njuj^Di-V537>Sw-_Mt%{dF?vP-pfcpb> zdgGdMsgki^x_95c=8Y^wdR|p|Vv(7CBT_@KRP3d}gOC^{6Uu^NV{n78OtVybb6O1k zom8V~^b#k>{gLj1yhG1~r-EyjmAiK*7f@tZ;{rcm;h_3RVr`qNQ3^6O`7593%QI`^ zJqVjXjawwmPnPGzM6SEV^fCG8-Is1l*BgH{^|u&H?p4JuX=Di?V! zbLFm)bG`Y*4Qr2gk~hh39Vd=tDYOh}jKiYU;Az)|9-(P|Jir_HO=YcC{2HF3}aJnLEi95KM zfMLL66k8j?_ylB;ZsX?5293)IXrtHjgFr&%Ltr>9WZ}7@idBFwOOVx-pbN{1*Og-Q zd$DafJiruNDZ21d36P6HrMCj}&+*gc7^wSaYfai`r3C_@>pr*BX=9xCmUV8eNgPi! zLEP}mGJkF*I(<@8xU2oepe>7r^>pwkMg?gWJ90&k_Hhn0vy$7xAtV!;UE{LD3n1*dX5s2LT zIBs5BLr}CYR(FhO2#vGUoP5rYeP-LGW7w-0!Q60ZKA+mh{Z!EBZLx3hP^g|`P^@f9 zC@?a&aO{#n>BJQBEFjG<^vEgY9`27gB9u)xyb!{BpTHE(P>ZIRV+!*YP93v55#p&G60|SE!Ysk7 ziXIqHBVgq;NAhL)E>GM;58Nm25(36k{yfJ%;fn0-W) zMUg&=7Hol^X{90AN6Lq-^QTi%E;vjU?Q?)&n81i!!?!-K&gDkN@e_cH`B4+zaTBs( zPq_LRnm!v=mOz}+$%WEWiI{Y_Yx(CBWMgf127~fxpiG4`2cN zw!q)G!PtWtnJiP?G@~mkhV59_J@!PDyTzv6dtKyvss{! NwkYdEb}Du%{|2n_qH_QM