Skip to content

Commit

Permalink
chore: fix CI (#133)
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentchalamon committed Jun 6, 2023
1 parent ad8fa7d commit f240dab
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 13 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2

updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,34 @@ on:
- main
- '[0-9].x'

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
tests:
name: Tests PHP ${{ matrix.php }} (Symfony ${{ matrix.symfony }})
runs-on: ubuntu-latest
strategy:
matrix:
php:
- '7.4'
- '8.0'
- '8.1'
- '8.2'
symfony:
- '4.4.*'
- '5.4.*'
- '6.1.*'
- '6.3.*'
include:
- php: '7.4'
symfony: '5.4.*'
bootable: true
- php: '8.1'
symfony: '6.1.*'
- php: '8.2'
symfony: '6.3.*'
coverage: '--coverage-clover build/logs/phpunit/clover.xml'
bootable: true
quality: true
exclude:
# Symfony 6.1 requires PHP 8.1
- php: '7.4'
symfony: '6.1.*'
# Symfony 6.3 requires PHP 8.1
- php: '8.0'
symfony: '6.1.*'
symfony: '6.3.*'
fail-fast: false
steps:
- name: Checkout
Expand All @@ -54,6 +53,7 @@ jobs:
- name: Install chromium
run: |
sudo apt-get update
sudo apt-get --fix-broken install
sudo apt-get install -y --no-install-recommends chromium-browser
- name: Get Composer Cache Directory
Expand Down
2 changes: 1 addition & 1 deletion features/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// Run "composer dump-env prod" to create it (requires symfony/flex >=1.2)
if (is_array($env = @include __DIR__.'/.env.local.php')) {
foreach ($env as $k => $v) {
$_ENV[$k] = $_ENV[$k] ?? (isset($_SERVER[$k]) && 0 !== strpos($k, 'HTTP_') ? $_SERVER[$k] : $v);
$_ENV[$k] = $_ENV[$k] ?? (isset($_SERVER[$k]) && !str_starts_with($k, 'HTTP_') ? $_SERVER[$k] : $v);
}
} else {
// load all the .env files
Expand Down
2 changes: 1 addition & 1 deletion tests/ProphecyTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ trait ProphecyTrait
*
* @psalm-param class-string|null $classOrInterface
*/
protected function prophesize(?string $classOrInterface = null): ObjectProphecy
protected function prophesize(string $classOrInterface = null): ObjectProphecy
{
if (\is_string($classOrInterface)) {
\assert($this instanceof TestCase);
Expand Down

0 comments on commit f240dab

Please sign in to comment.