From 9f3bd5bfb9e1858c388b6d704e897cccf52c2f04 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 4 Mar 2021 23:36:49 +0100 Subject: [PATCH] Adjust extensions used on GitHub actions workflows Signed-off-by: William Desportes --- .github/workflows/lint-and-analyse-php.yml | 8 +++----- .github/workflows/test-selenium.yml | 3 +-- .github/workflows/tests.yml | 8 ++------ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/lint-and-analyse-php.yml b/.github/workflows/lint-and-analyse-php.yml index b84a6a6ffd..43ee57fb38 100644 --- a/.github/workflows/lint-and-analyse-php.yml +++ b/.github/workflows/lint-and-analyse-php.yml @@ -45,8 +45,6 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: 7.1 - extensions: mbstring, iconv, mysqli, zip, gd - tools: composer:v2 - name: Validate composer.json and composer.lock run: composer validate - name: Cache module @@ -60,7 +58,8 @@ jobs: path: .phpcs-cache key: phpcs-cache - name: Install dependencies - run: composer install + # Ignore zip for php-webdriver/webdriver + run: composer install --ignore-platform-req=ext-zip - name: Lint PHP files run: ./test/ci-phplint - name: Check coding-standard @@ -77,8 +76,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: 7.2 - extensions: mbstring, iconv, mysqli, zip, gd - tools: composer:v2 + extensions: mbstring, iconv, mysqli, zip, gd, bz2 - name: Cache module uses: actions/cache@v2 with: diff --git a/.github/workflows/test-selenium.yml b/.github/workflows/test-selenium.yml index 5e401c290a..432bb17ec1 100644 --- a/.github/workflows/test-selenium.yml +++ b/.github/workflows/test-selenium.yml @@ -62,8 +62,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} - extensions: mbstring, iconv, mysqli, zip, gd - tools: composer:v2 + extensions: mbstring, iconv, mysqli, zip, gd, bz2 - name: Cache module uses: actions/cache@v2 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ea63e87415..6259f02724 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,9 +27,8 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} - extensions: mbstring, iconv, mysqli, zip, gd + extensions: mbstring, iconv, mysqli, zip, gd, bz2 coverage: xdebug - tools: composer:v2 - name: Cache module uses: actions/cache@v2 with: @@ -78,7 +77,6 @@ jobs: php-version: ${{ matrix.php-version }} extensions: dbase, mbstring, iconv, mysqli, zip, gd coverage: xdebug - tools: composer:v2 - name: Cache module uses: actions/cache@v2 with: @@ -127,7 +125,6 @@ jobs: php-version: ${{ matrix.php-version }} extensions: recode, mbstring, iconv, mysqli, zip, gd coverage: xdebug - tools: composer:v2 - name: Cache module uses: actions/cache@v2 with: @@ -174,8 +171,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }} - extensions: mbstring, iconv, mysqli, zip, gd - tools: composer:v2 + extensions: mbstring, iconv, mysqli, zip, gd, bz2 - name: Cache module uses: actions/cache@v2 with: