Merge pull request #64 from shivammathur/develop

Speed improvements and fixes for shell change in windows
shivammathur · Oct 24, 2019 · 16267e1 · 16267e1
2 parents b132b4e + 91d14c7
commit 16267e1
Show file tree

Hide file tree

Showing 20 changed files with 138 additions and 80 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -30,7 +30,6 @@ jobs:
     - name: Send Coverage
       continue-on-error: true
       timeout-minutes: 2
-      shell: pwsh
       run: curl -s https://codecov.io/bash | bash -s -- -t ${{secrets.CODECOV_TOKEN}} -f coverage/clover.xml -n github-actions-codecov-${{ matrix.operating-system }}-php${{ matrix.php-versions }}
 
     - name: Setup PHP with extensions and custom config
@@ -48,6 +47,6 @@ jobs:
       run: php -m
     - name: Testing ini values
       run: |
-        php -r "echo \"post_max_size: \" . ini_get('post_max_size') . \"\n\";"
-        php -r "echo \"short_open_tag: \" . ini_get('short_open_tag') . \"\n\";"
-        php -r "echo \"date.timezone: \" . ini_get('date.timezone') . \"\n\";"
+        printf "post_max_size: %s\n" $(php -r "echo ini_get('post_max_size');")
+        printf "short_open_tag: %s\n" $(php -r "echo ini_get('short_open_tag');")
+        printf "date.timezone: %s\n" $(php -r "echo ini_get('date.timezone');")
diff --git 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 install -y php7.2-xdebug'
+      'sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php7.2-xdebug'
     );
     expect(linux).toContain(
-      'sudo DEBIAN_FRONTEND=noninteractive apt install -y php7.2-pcov'
+      'sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php7.2-pcov'
     );
 
     linux = await extensions.addExtension('xdebug, pcov', '7.4', 'linux');

diff --git a/examples/codeigniter.yml b/examples/codeigniter.yml
@@ -21,5 +21,4 @@ jobs:
       - name: Install dependencies
         run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
       - name: Test with phpunit
-        run: vendor/bin/phpunit --coverage-text
-        shell: pwsh
+        run: vendor/bin/phpunit --coverage-text
diff --git a/examples/laravel.yml b/examples/laravel.yml
@@ -29,5 +29,4 @@ jobs:
       - name: Clear Config
         run: php artisan config:clear
       - name: Test with phpunit
-        run: vendor/bin/phpunit --coverage-text
-        shell: pwsh
+        run: vendor/bin/phpunit --coverage-text
diff --git a/examples/lumen.yml b/examples/lumen.yml
@@ -25,5 +25,4 @@ jobs:
       - name: Prepare the application
         run: php -r "file_exists('.env') || copy('.env.example', '.env');"
       - name: Test with phpunit
-        run: vendor/bin/phpunit --coverage-text
-        shell: pwsh
+        run: vendor/bin/phpunit --coverage-text
diff --git a/examples/slim-framework.yml b/examples/slim-framework.yml
@@ -21,5 +21,4 @@ jobs:
       - name: Install dependencies
         run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
       - name: Test with phpunit
-        run: vendor/bin/phpunit --coverage-text
-        shell: pwsh
+        run: vendor/bin/phpunit --coverage-text
diff --git a/examples/zend-framework.yml b/examples/zend-framework.yml
@@ -23,5 +23,4 @@ jobs:
           composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
           composer require --dev phpunit/phpunit squizlabs/php_codesniffer zendframework/zend-test
       - name: Test with phpunit
-        run: vendor/bin/phpunit --coverage-text
-        shell: pwsh
+        run: vendor/bin/phpunit --coverage-text
diff --git a/lib/extensions.js b/lib/extensions.js
@@ -172,7 +172,7 @@ function addExtensionLinux(extension_csv, version) {
                         break;
                     default:
                         install_command =
-                            'sudo DEBIAN_FRONTEND=noninteractive apt install -y php' +
+                            'sudo DEBIAN_FRONTEND=noninteractive apt-fast install -y php' +
                                 version +
                                 '-' +
                                 extension +

diff --git a/lib/install.js b/lib/install.js
@@ -63,7 +63,7 @@ function run() {
             }
             else if (os_version == 'win32') {
                 yield build('win32.ps1', version, os_version);
-                yield exec_1.exec('powershell .\\' + version + 'win32.ps1 -version ' + version);
+                yield exec_1.exec('pwsh .\\' + version + 'win32.ps1 -version ' + version);
             }
             else if (os_version == 'linux') {
                 yield build('linux.sh', version, os_version);

diff --git a/node_modules/@actions/core/README.md b/node_modules/@actions/core/README.md
diff --git a/node_modules/@actions/core/lib/core.d.ts b/node_modules/@actions/core/lib/core.d.ts
diff --git a/node_modules/@actions/core/lib/core.js b/node_modules/@actions/core/lib/core.js
diff --git a/node_modules/@actions/core/lib/core.js.map b/node_modules/@actions/core/lib/core.js.map
diff --git a/node_modules/@actions/core/package.json b/node_modules/@actions/core/package.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-php",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "private": false,
   "description": "Setup php action",
   "main": "lib/setup-php.js",