Skip to content

Commit 8912e81

Browse files
authored
Merge pull request #366 from itk-dev/release/1.2.0
Added updated config
2 parents 32bb3e2 + 4a2fbfc commit 8912e81

File tree

5 files changed

+632
-627
lines changed

5 files changed

+632
-627
lines changed

.github/workflows/pr.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
run: |
4848
composer install --no-interaction --no-progress
4949
composer normalize composer.json --dry-run
50+
composer audit
5051
5152
config-check:
5253
name: Check that config is up to date
@@ -59,13 +60,10 @@ jobs:
5960
docker network create frontend
6061
docker compose pull
6162
docker compose up --detach
62-
6363
# Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
6464
docker compose exec --user root phpfpm composer install --no-interaction
65-
6665
# Install the site
6766
docker compose exec --user root phpfpm vendor/bin/drush site:install --existing-config --yes
68-
6967
- name: Export config
7068
run: docker compose exec --user root phpfpm vendor/bin/drush config:export --yes
7169
- name: Check for changes in config

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
## [Unreleased]
1010

11+
## [1.2.0]
12+
13+
- [PR-366](https://github.com/itk-dev/os2loop/pull/366)
14+
- Security update
15+
- Drupal Core 10.3.6 => 10.4.3
16+
- XLS serialization 1.4.0 => 2.0.0
1117

1218
## [1.1.4]
1319

@@ -21,7 +27,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
2127

2228
## [1.1.2]
2329

24-
- [PR-362](https://github.com/itk-dev/os2loop/pull/362)
30+
- [PR-362](https://github.com/itk-dev/os2loop/pull/362)
2531
- Change Share with a friend form
2632
- Add chosen lib
2733
- Use chosen lib for profession and expertise fields

composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"drupal/color": "^1.0",
1818
"drupal/config_ignore": "^2.4",
1919
"drupal/convert_media_tags_to_markup": "^3.0",
20-
"drupal/core-composer-scaffold": "^10.1",
21-
"drupal/core-project-message": "^10.1",
22-
"drupal/core-recommended": "^10.1",
20+
"drupal/core-composer-scaffold": "^10.4",
21+
"drupal/core-project-message": "^10.4",
22+
"drupal/core-recommended": "^10.4",
2323
"drupal/date_popup": "^2.0",
2424
"drupal/diff": "^1.1",
2525
"drupal/entity_print": "^2.13",
@@ -57,7 +57,7 @@
5757
"drupal/views_data_export": "^1.3",
5858
"drupal/views_flag_refresh": "^1.0",
5959
"drupal/viewsreference": "^2.0@beta",
60-
"drupal/xls_serialization": "^1.3",
60+
"drupal/xls_serialization": "^2.0",
6161
"drush/drush": "^12.2",
6262
"jjj/chosen": "2.2.1"
6363
},
@@ -208,8 +208,7 @@
208208
},
209209
"patches": {
210210
"drupal/core": {
211-
"Disable forced configuration langcode (https://www.drupal.org/project/drupal/issues/3150540)": "https://www.drupal.org/files/issues/2024-07-03/drupal-3150540-42.patch",
212-
"Handle undefined index when using form states (https://www.drupal.org/project/drupal/issues/2700667)": "https://www.drupal.org/files/issues/2020-03-11/2700667-104.patch"
211+
"Disable forced configuration langcode (https://www.drupal.org/project/drupal/issues/3150540)": "https://www.drupal.org/files/issues/2024-07-03/drupal-3150540-42.patch"
213212
},
214213
"drupal/devel": {
215214
"Public methods are not visible in kint (https://gitlab.com/drupalspoons/devel/-/issues/221 via https://www.drupal.org/project/devel/issues/3112201)": "https://gitlab.com/-/project/18040690/uploads/7897853cd83cb829ae8d752657e2f497/kint.221-5-3.patch"

0 commit comments

Comments
 (0)