Skip to content

Commit

Permalink
Revert to apt for extensions
Browse files Browse the repository at this point in the history
  • Loading branch information
shivammathur committed Nov 6, 2019
1 parent e5076ce commit 0815f5a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 10 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
4 changes: 2 additions & 2 deletions __tests__/extensions.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion lib/extensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 +
Expand Down
13 changes: 9 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/extensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 +
Expand Down

0 comments on commit 0815f5a

Please sign in to comment.