Skip to content

Commit

Permalink
Merge pull request #620 from danskernesdigitalebibliotek/release/2024…
Browse files Browse the repository at this point in the history
…-4-0

Release 2024.4.0
  • Loading branch information
kasperg authored Jan 22, 2024
2 parents 762e3d8 + 8cb072f commit 7add7ad
Show file tree
Hide file tree
Showing 173 changed files with 5,773 additions and 1,399 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,3 +257,23 @@ jobs:
run: task ci:openapi:download
- name: Ensure specification has not drifted
run: git diff --ignore-space-at-eol --exit-code openapi.json

CheckDrupalConfig:
name: Check Drupal Config
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
# Our Taskfile requires a proper checkout to function because of
# certain vars.
fetch-depth: 0
- name: Install go-task
uses: arduino/setup-task@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Setup site
run: task ci:reset
- name: Export configuration
run: task dev:cli -- drush config-export -y
- name: Check for uncommited configuration after install
run: git diff --ignore-space-at-eol --exit-code config/sync/*.yml
18 changes: 18 additions & 0 deletions .lagoon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,24 @@ tasks:
drush locale-check
drush locale-update
service: cli
- run:
name: Create test users
command: |
drush user:create editor --password="$PR_DRUPAL_PWD"
drush user:role:add 'editor' editor
drush user:create administrator --password="$PR_DRUPAL_PWD"
drush user:role:add 'administrator' administrator
drush user:create mediator --password="$PR_DRUPAL_PWD"
drush user:role:add 'mediator' mediator
drush user:create local_administrator --password="$PR_DRUPAL_PWD"
drush user:role:add 'local_administrator' local_administrator
drush user:create patron --password="$PR_DRUPAL_PWD"
drush user:role:add 'patron' patron
service: cli

environments:
main:
Expand Down
21 changes: 21 additions & 0 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ tasks:
- task dev:cli -- php vendor/bin/phpcs
- task dev:cli -- php vendor/bin/twig-cs-fixer lint --fix
- task dev:cli -- php vendor/bin/phpstan
- yarn install --frozen-lockfile
- npx eslint web -c .eslintrc.json --fix

dev:build:
summary: Build docker containers
Expand Down Expand Up @@ -166,6 +168,7 @@ tasks:
- task dev:cli -- curl --silent --show-error --fail --output /dev/null http://varnish:8080/
# Enable dev modules.
- task dev:enable-dev-tools
- task dev:create-users
# Show a one-time login to the local site.
- task dev:cli -- drush user-login

Expand All @@ -186,6 +189,24 @@ tasks:
cmds:
- docker compose run -e XDEBUG_ENABLE=true -e XDEBUG_MODE=coverage,debug cli vendor/bin/phpunit --coverage-text

dev:create-users:
desc: Create test users, with test roles
cmds:
- task dev:cli -- drush user:create editor --password="test"
- task dev:cli -- drush user:role:add 'editor' editor

- task dev:cli -- drush user:create administrator --password="test"
- task dev:cli -- drush user:role:add 'administrator' administrator

- task dev:cli -- drush user:create mediator --password="test"
- task dev:cli -- drush user:role:add 'mediator' mediator

- task dev:cli -- drush user:create local_administrator --password="test"
- task dev:cli -- drush user:role:add 'local_administrator' local_administrator

- task dev:cli -- drush user:create patron --password="test"
- task dev:cli -- drush user:role:add 'patron' patron

dev:restore:database:
desc: 'Restore database from db dump file. Only one sql should be present the "{{ .DIR_RESTORE_DATABASE }}" directory.'
cmds:
Expand Down
21 changes: 15 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
"type": "package",
"package": {
"name": "danskernesdigitalebibliotek/dpl-react",
"version": "2024.3.1",
"version": "2024.4.0",
"type": "drupal-library",
"dist": {
"url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.3.1/dist-2024-3-1-313e9fafe4a7cd33ef7b866afc3ec4ba68f088c3.zip",
"url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.4.0/dist-2024-4-0-78d8f3aa13df3978fbf234e421fb3c79a97efa97.zip",
"type": "zip"
},
"require": {
Expand All @@ -52,9 +52,9 @@
"package": {
"name": "danskernesdigitalebibliotek/dpl-design-system",
"type": "drupal-library",
"version": "2024.3.0",
"version": "2024.4.0",
"dist": {
"url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.3.0/dist-2024-3-0-136d32245d71b18c6aa57fddb40d238b243cbb6e.zip",
"url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.4.0/dist-2024-4-0-174d424951b2cc03e92bd2522b707f59226e8f12.zip",
"type": "zip"
}
}
Expand All @@ -74,8 +74,8 @@
"brick/math": "^0.12.1",
"composer/installers": "1.12.0",
"cweagans/composer-patches": "1.7.3",
"danskernesdigitalebibliotek/dpl-design-system": "^2024.3",
"danskernesdigitalebibliotek/dpl-react": "^2024.3",
"danskernesdigitalebibliotek/dpl-design-system": "2024.4.0",
"danskernesdigitalebibliotek/dpl-react": "2024.4.0",
"danskernesdigitalebibliotek/fbs-client": "*",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
"deoliveiralucas/array-keys-case-transform": "^1.1",
Expand All @@ -86,8 +86,10 @@
"drupal/core-project-message": "~10.1.7",
"drupal/core-recommended": "~10.1.7",
"drupal/customerror": "^1.0@beta",
"drupal/date_range_formatter": "^4.0",
"drupal/default_content": "^2.0@alpha",
"drupal/devel": "^5.1",
"drupal/dynamic_entity_reference": "^3.1",
"drupal/enum_field": "^1.0",
"drupal/field_group": "^3.4",
"drupal/focal_point": "^2.0",
Expand All @@ -111,6 +113,7 @@
"drupal/recurring_events": "^2.0@RC",
"drupal/redis": "^1.7",
"drupal/restui": "^1.21",
"drupal/search_api": "^1.31",
"drupal/twig_tweak": "^3.2.1",
"drupal/upgrade_status": "^4.0",
"drupal/uuid_url": "^1.3",
Expand Down Expand Up @@ -226,6 +229,9 @@
"drupal/default_content": {
"3200212: Overwrite files on import": "https://git.drupalcode.org/project/default_content/-/merge_requests/8.patch"
},
"drupal/dynamic_entity_reference": {
"3405253: Update the FieldType category for clarity": "https://git.drupalcode.org/project/dynamic_entity_reference/-/commit/3f048d296f671906d15b0cdfbbadbea38f5f3c8b.patch"
},
"drupal/field_inheritance": {
"3330386: field_inheritance_form_alter should enforce module permissions": "https://git.drupalcode.org/project/field_inheritance/-/commit/bc3d26cdce8c09d5b6275fc126e35bc7e239c7d1.patch"
},
Expand All @@ -252,6 +258,9 @@
"Mark as Drupal 10 compatible": "patches/potion-d10-info.patch",
"Use Drupal StaticReflectionParser with Drupal 10.1": "patches/potion-d10-1-staticreflection.patch",
"3413314: Include .links.menu.yml files in YamlExtractor.php": "https://www.drupal.org/files/issues/2024-01-08/potion-add_links_menu_yml_title_and_description_to_yaml_extractor-3413314-3.patch"
},
"drupal/recurring_events": {
"3415222: Wrong namespace for return values": "https://git.drupalcode.org/project/recurring_events/-/merge_requests/83.patch"
}
}
}
Expand Down
Loading

0 comments on commit 7add7ad

Please sign in to comment.