From 0815f5a8bbbcbd8aef7aea6a899f947a5dba6d4d Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Thu, 7 Nov 2019 01:31:01 +0530 Subject: [PATCH] Revert to apt for extensions --- README.md | 4 ++-- __tests__/extensions.test.ts | 4 ++-- lib/extensions.js | 2 +- package-lock.json | 13 +++++++++---- src/extensions.ts | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 52320a50..2a086cad 100644 --- a/README.md +++ b/README.md @@ -186,14 +186,14 @@ You can persist composer's internal cache directory using the [`action/cache`](h run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache on linux and macOS if: matrix.operating-system != 'windows-latest' - uses: actions/cache@v1 + uses: actions/cache@v1 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: ${{ runner.os }}-composer- - name: Cache on windows if: matrix.operating-system == 'windows-latest' - uses: actions/cache@v1 + uses: actions/cache@v1 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**composer.lock') }} diff --git a/__tests__/extensions.test.ts b/__tests__/extensions.test.ts index 1a7358dd..0d125c61 100644 --- a/__tests__/extensions.test.ts +++ b/__tests__/extensions.test.ts @@ -40,10 +40,10 @@ describe('Extension tests', () => { 'linux' ); expect(linux).toContain( - 'sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php7.2-xdebug' + 'sudo DEBIAN_FRONTEND=noninteractive apt install -y php7.2-xdebug' ); expect(linux).toContain( - 'sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php7.2-pcov' + 'sudo DEBIAN_FRONTEND=noninteractive apt install -y php7.2-pcov' ); linux = await extensions.addExtension('xdebug, pcov', '7.4', 'linux'); diff --git a/lib/extensions.js b/lib/extensions.js index 1a61ba8a..c1c620ba 100644 --- a/lib/extensions.js +++ b/lib/extensions.js @@ -192,7 +192,7 @@ function addExtensionLinux(extension_csv, version) { break; default: install_command = - 'sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php' + + 'sudo DEBIAN_FRONTEND=noninteractive apt install -y php' + version + '-' + extension + diff --git a/package-lock.json b/package-lock.json index ec944aad..786da2e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1744,7 +1744,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2159,7 +2160,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2215,6 +2217,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2258,12 +2261,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/src/extensions.ts b/src/extensions.ts index cd5e5c6a..1ddfcd4f 100644 --- a/src/extensions.ts +++ b/src/extensions.ts @@ -185,7 +185,7 @@ export async function addExtensionLinux( break; default: install_command = - 'sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php' + + 'sudo DEBIAN_FRONTEND=noninteractive apt install -y php' + version + '-' + extension +