Merge pull request #4 from shivammathur/develop

Fix reading php version
shivammathur · Feb 17, 2020 · 08cc68f · 08cc68f
2 parents ac570d4 + 6efc9a6
commit 08cc68f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1550,7 +1550,8 @@ const utils = __importStar(__webpack_require__(163));
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const version = yield utils.getInput('php-version', true);
+            let version = yield utils.getInput('php-version', true);
+            version = version.length > 1 ? version.slice(0, 3) : version + '.0';
             const extensions = yield utils.getInput('extensions', true);
             const key = yield utils.getInput('key', true);
             const script_path = path.join(__dirname, '../src/extensions.sh');

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cache-extensions",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": false,
   "description": "Cache extensions in GitHub Actions",
   "main": "dist/index.js",

diff --git a/src/cache.ts b/src/cache.ts
@@ -8,7 +8,8 @@ import * as utils from './utils';
  */
 export async function run(): Promise<void> {
   try {
-    const version: string = await utils.getInput('php-version', true);
+    let version: string = await utils.getInput('php-version', true);
+    version = version.length > 1 ? version.slice(0, 3) : version + '.0';
     const extensions: string = await utils.getInput('extensions', true);
     const key: string = await utils.getInput('key', true);
     const script_path: string = path.join(__dirname, '../src/extensions.sh');