Skip to content

Commit

Permalink
Merge pull request #213 from PHPCSStandards/feature/ghactions-fix-build
Browse files Browse the repository at this point in the history
GH Actions: fix the build
  • Loading branch information
jrfnl committed Dec 3, 2023
2 parents eda4086 + 49c9f1b commit 14ce2a4
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 8 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/integrationtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ jobs:
- php: '5.5'
composer: 'v1'
os: 'windows-latest'
# Installing on Windows with PHP 5.4 runs into all sorts of problems (which are not ours).
# Considering PHP 5.4 is ancient, I deem it acceptable to exclude the Windows PHP 5.4 builds.
# @link https://github.com/PHPCSStandards/composer-installer/pull/213
- php: '5.4'
os: 'windows-latest'

include:
# Composer 2.3 drops support for PHP < 7.2, so for PHP 5.4 to 7.1, `v2` will install
Expand Down Expand Up @@ -125,10 +130,6 @@ jobs:
env:
fail-fast: true

- name: "Conditionally disable tls (Composer 1.x/Windows/PHP 5.4)"
if: ${{ matrix.os == 'windows-latest' && matrix.composer == 'v1' && matrix.php == '5.4' }}
run: composer config -- disable-tls true

# Install dependencies and handle caching in one go.
# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
- name: Install Composer dependencies
Expand Down
19 changes: 15 additions & 4 deletions .github/workflows/quicktest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,21 @@ jobs:
- 'ubuntu-latest'
- 'windows-latest'

# Installing on Windows with PHP 5.4 runs into all sorts of problems (which are not ours).
# Exclude the Windows PHP 5.4 builds and replace them with PHP 5.5/5.6 for the same.
# @link https://github.com/PHPCSStandards/composer-installer/issues/181
# @link https://github.com/PHPCSStandards/composer-installer/pull/213
exclude:
- php: '5.4'
os: 'windows-latest'
include:
- php: '5.5'
composer: 'v2'
os: 'windows-latest'
- php: '5.6'
composer: 'v1'
os: 'windows-latest'

name: "Quick test"

steps:
Expand All @@ -52,10 +67,6 @@ jobs:
env:
fail-fast: true

- name: "Conditionally disable tls (Composer 1.x/Windows/PHP 5.4)"
if: ${{ matrix.os == 'windows-latest' && matrix.composer == 'v1' && matrix.php == '5.4' }}
run: composer config -- disable-tls true

# Install dependencies and handle caching in one go.
# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
- name: Install Composer dependencies
Expand Down

0 comments on commit 14ce2a4

Please sign in to comment.