Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OEL-2794: Update components to run on Drupal 10.2.x #252

Merged
merged 5 commits into from
Feb 12, 2024
Merged

OEL-2794: Update components to run on Drupal 10.2.x #252

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5fa2c65
OEL-2794: Update drone and composer.
AaronGilMartinez Jan 22, 2024
ea540ba
OEL-2794: Core patch override.
AaronGilMartinez Jan 23, 2024
311d67e
OEL-2794: Drone release event condition.
AaronGilMartinez Jan 23, 2024
de0277a
OEL-2794: Update oe_content.
AaronGilMartinez Feb 9, 2024
11e5387
OEL-2794: Update av sources.
AaronGilMartinez Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,19 @@ pipeline:
- npm install --unsafe-perm
- NODE_ENV=production npm run production

composer-change-patch:
group: warmup
image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
volumes:
- /cache:/cache
commands:
# Change the patch for 10.1.x.
- >
composer config --merge --json "extra.patches.drupal/core" '{"https://www.drupal.org/project/drupal/issues/2230909": "https://www.drupal.org/files/issues/2022-07-26/2230909-269.patch"}'
when:
matrix:
CORE_VERSION: "10.1.0"

composer-install:
group: prepare
image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
Expand Down Expand Up @@ -91,7 +104,7 @@ pipeline:
when:
event: tag
matrix:
CORE_VERSION: "10.0.0"
CORE_VERSION: "10.1.0"
drishu marked this conversation as resolved.
Show resolved Hide resolved
PHP_VERSION: "8.1"

github-release:
Expand All @@ -103,16 +116,16 @@ pipeline:
when:
event: tag
matrix:
CORE_VERSION: "10.0.0"
CORE_VERSION: "10.1.0"
PHP_VERSION: "8.1"

matrix:
include:
- CORE_VERSION: 10.0.0
PHP_VERSION: 8.1
- CORE_VERSION: 10.0.0
PHP_VERSION: 8.2
- CORE_VERSION: 10.1.0
PHP_VERSION: 8.1
- CORE_VERSION: 10.1.0
PHP_VERSION: 8.2
- CORE_VERSION: 10.2.0
PHP_VERSION: 8.1
- CORE_VERSION: 10.2.0
PHP_VERSION: 8.2
9 changes: 9 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ Ideally this project should be managed with [Docker](https://www.docker.com/get-

Check the [composer.json](composer.json) for required PHP version and other dependencies.

#### Drupal 10.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this as oe_content is a dev dependency

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed


For Drupal 10.1, the drupal/core patch needs to be overridden.
If you require this module in Drupal 10.1 you must set the patch in your composer.json.\
You can do this with the following command:
```bash
composer config --merge --json "extra.patches.drupal/core" '{"https://www.drupal.org/project/drupal/issues/2230909": "https://www.drupal.org/files/issues/2022-07-26/2230909-269.patch"}'
```

### Add the composer package

Add this manually in composer.json, or combine with existing entries:
Expand Down
16 changes: 14 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"drupal/search_api": "^1.29",
"drupal/search_api_autocomplete": "^1.7",
"drupal/typed_link": "^2.0.1",
"drush/drush": "^11.1",
"drush/drush": "^12.4",
"mikey179/vfsstream": "^1.6.10",
"nikic/php-parser": "^4",
"openeuropa/code-review": "^2.0.0-alpha6",
Expand Down Expand Up @@ -103,7 +103,19 @@
},
"_readme": [
"Explicit requirement of nikic/php-parser ^4 as later versions are not compatible with grumphp @see https://github.com/phpro/grumphp/issues/1119"
]
],
"patches": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we really need this in our project?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

"drupal/core": {
"https://www.drupal.org/project/drupal/issues/2230909": "https://www.drupal.org/files/issues/2023-12-21/2230909-309.patch"
}
},
"patches-ignore": {
"openeuropa/oe_content": {
"drupal/core": {
"https://www.drupal.org/project/drupal/issues/2230909": "https://www.drupal.org/files/issues/2022-07-26/2230909-269.patch"
}
}
}
},
"config": {
"sort-packages": true,
Expand Down