Skip to content

Commit

Permalink
Update ci.yml (#88)
Browse files Browse the repository at this point in the history
* Update ci.yml

Execute CI on 1.3.x

* phpcs

* - updated chrome.sh/firefox.sh to download driver using bdi
- fixing firefox options
- update shell scripts

* phpcs

* moved 8.3 into stable and 8.4 into experimental

* removed 8.0 EOL

* added phpstan-baseline.neon

* fix tests

* update ci.yaml

* trigger

* phpcs

* phpstan

* phpcs

* phpcs
  • Loading branch information
oleg-andreyev committed Nov 13, 2024
1 parent 115a363 commit 1a8622f
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 7 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ on:
branches:
- "master"
- "1.3"
- "1.4"
pull_request:
branches:
- "master"
- "1.3"
- "1.4"

env:
DRIVER_URL: "http://localhost:4444"
Expand All @@ -22,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ 8.0 ]
php: [ 8.3 ]
steps:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -50,9 +52,13 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ 8.0, 8.1, 8.2, 8.3 ]
php: [ 8.1, 8.2, 8.3 ]
browser: [ chrome, firefox ]
experimental: [false]
include:
- php: 8.4
experimental: true
browser: chrome
continue-on-error: ${{ matrix.experimental }}
timeout-minutes: 5
steps:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ vendor/
!bin/start_webserver.sh
.phpunit.result.cache
.php-cs-fixer.cache
driver.zip
driver.tar.gz
2 changes: 1 addition & 1 deletion .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
return (new PhpCsFixer\Config())
->setRiskyAllowed(true)
->setRules([
'@PHP80Migration' => true,
'@PHP81Migration' => true,
'@PHPUnit91Migration:risky' => true,
'@Symfony' => true,
])
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,4 @@ Follow https://github.com/shivammathur/setup-php#local-testing-setup

## Copyright

Copyright (c) 2023 Oleg Andreyev <[email protected]>

Copyright (c) 2024 Oleg Andreyev <[email protected]>
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}
],
"require": {
"php": ">=8.0",
"php": ">=8.1",
"behat/mink": "^1.10",
"php-webdriver/webdriver": "^1.14"
},
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<!-- FIREFOX -->
<!--<env name="BROWSER_NAME" value="firefox"/>-->
<!--https://developer.mozilla.org/en-US/docs/Web/WebDriver/Capabilities/firefoxOptions#binary-->
<!-- <env name="DRIVER_OPTIONS" value='{"log": {"level":"trace"}, "args": ["-headless"]}'/>-->
<!-- <env name="DRIVER_OPTIONS" value='{"log": {"level":"trace"}, "args": ["-headless"]}'/>-->
<!--<env name="DRIVER_OPTIONS" value='{"log": {"level":"trace"}, "binary": "/Applications/Firefox Developer Edition.app/Contents/MacOS/firefox-bin"}'/>-->
</php>
</phpunit>
1 change: 1 addition & 0 deletions tests/WebDriverConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ private function buildChromeOptions(DesiredCapabilities $desiredCapabilities, Ch
*/
private function buildFirefoxProfile(DesiredCapabilities $desiredCapabilities, FirefoxProfile $optionsOrProfile, array $driverOptions): FirefoxProfile
{
/* @var FirefoxOptions|array $firefoxOptions */
if (isset($driverOptions['binary'])) {
$firefoxOptions = $desiredCapabilities->getCapability(FirefoxOptions::CAPABILITY);
if (empty($firefoxOptions)) {
Expand Down

0 comments on commit 1a8622f

Please sign in to comment.