Skip to content

Commit

Permalink
Merge branch 'release/4.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
sayan goswami committed May 23, 2024
2 parents b5e1c02 + b665845 commit b1cdb31
Show file tree
Hide file tree
Showing 70 changed files with 1,052 additions and 1,054 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/live-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- cron: "0 0 * * *"
jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# Boolean values must be quoted, otherwise they will be converted to lower case and break ORCA scripts.
ORCA_SUT_NAME: drupal/example
Expand All @@ -33,7 +33,7 @@ jobs:
matrix:
orca-job:
- " "
php-version: [ "8.1" ]
php-version: [ "8.1", "8.3" ]
steps:
- uses: actions/checkout@v2

Expand Down
23 changes: 18 additions & 5 deletions .github/workflows/orca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- cron: "0 0 * * *"
jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# Boolean values must be quoted, otherwise they will be converted to lower case and break ORCA scripts.
ORCA_SUT_NAME: drupal/example
Expand Down Expand Up @@ -61,12 +61,9 @@ jobs:
- ISOLATED_TEST_ON_NEXT_MINOR_DEV
# - INTEGRATED_UPGRADE_TEST_TO_NEXT_MINOR_DEV
- LOOSE_DEPRECATED_CODE_SCAN
- INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
- ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
- INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
php-version: [ "8.1", "8.3" ]
orca-enable-nightwatch: [ "FALSE" ]
orca-coverage-enable: [ "FALSE" ]
orca-coverage-enable: [ "TRUE" ]
include:
# Testing Drupal 10 in php 8.1 with nightwatch and coverage.
- orca-job: ISOLATED_TEST_ON_CURRENT
Expand All @@ -86,6 +83,22 @@ jobs:
- orca-job: INTEGRATED_TEST_ON_LATEST_EOL_MAJOR
php-version: "8.1"

# Testing Drupal 11 in php 8.3.
- orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
php-version: "8.3"

# Testing Drupal 11 in php 8.3.
- orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_BETA_OR_LATER
php-version: "8.3"

# Testing Drupal 11 in php 8.3.
- orca-job: ISOLATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
php-version: "8.3"

# Testing Drupal 11 in php 8.3.
- orca-job: INTEGRATED_TEST_ON_NEXT_MAJOR_LATEST_MINOR_DEV
php-version: "8.3"

steps:
- uses: actions/checkout@v3

Expand Down
6 changes: 5 additions & 1 deletion .idea/orca.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"oscarotero/env": "^2.1",
"php-parallel-lint/php-console-highlighter": "^1.0",
"php-parallel-lint/php-parallel-lint": "^1.3.2",
"phploc/phploc": "^7.0.2",
"phpmd/phpmd": "^2.13",
"symfony/config": "^6.2.7",
"symfony/console": "^5.4.22",
Expand All @@ -60,7 +59,9 @@
"brainmaestro/composer-git-hooks": "^2.8.5",
"phpspec/prophecy-phpunit": "^2.0.2",
"phpstan/phpstan": "^1.10.14",
"phpunit/phpunit": "^9.6.7"
"phpunit/php-code-coverage": "^10",
"phpunit/php-file-iterator": "^4.0",
"phpunit/phpunit": "^10"
},
"conflict": {
"symfony/symfony": "*"
Expand Down Expand Up @@ -111,6 +112,10 @@
"phpcodesniffer-search-depth": 4
},
"scripts": {
"post-install-cmd": [
"php -r \"copy('https://phar.phpunit.de/phploc.phar', 'vendor/bin/phploc');\"",
"chmod u+x vendor/bin/phploc"
],
"post-update-cmd": [
"@composer normalize"
],
Expand Down
Loading

0 comments on commit b1cdb31

Please sign in to comment.