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

AV-2055: Upgrade to drupal 10 #2099

Merged
merged 19 commits into from
Nov 6, 2023
Merged

AV-2055: Upgrade to drupal 10 #2099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6279f92
AV-2055: uninstall deprecated modules
Zharktas Oct 18, 2023
889d4f3
AV-2055: Remove drupal console as its no drupal 10 compatible and not…
Zharktas Oct 18, 2023
a4d8d33
Disable dev mode as it needs drupal console
Zharktas Oct 18, 2023
b0a41ae
AV-2055: Upgrade drupal packages
Zharktas Oct 18, 2023
2e8e53b
Search and page_cache does not exist
Zharktas Oct 23, 2023
7ca6788
node_types were removed and replaced by entity_bundle:node which are …
Zharktas Oct 23, 2023
40b2a3b
Merge branch 'master' into AV-2055_upgrade_to_drupal_10
Zharktas Oct 23, 2023
c684217
remove version limit from composer
Zharktas Oct 23, 2023
ee7357f
Merge branch 'AV-2055_upgrade_to_drupal_10' of https://github.com/vrk…
Zharktas Oct 23, 2023
fd049c3
Merge branch 'master' into AV-2055_upgrade_to_drupal_10
Zharktas Oct 25, 2023
d4c67a8
Merge branch 'master' into AV-2055_upgrade_to_drupal_10
Zharktas Oct 26, 2023
005bbe4
AV-2055: move guide related search configurations from them to guide …
Zharktas Oct 26, 2023
0707abd
node_type is now "entity_bundle:node"
Zharktas Oct 26, 2023
93f9b64
Remove uninstall of ckeditor, its already uninstalled
Zharktas Oct 26, 2023
6e2fbc2
Merge branch 'AV-2055_upgrade_to_drupal_10' of https://github.com/vrk…
Zharktas Oct 26, 2023
06c98b2
Update test
Zharktas Oct 26, 2023
dae8b6e
Merge branch 'master' into AV-2055_upgrade_to_drupal_10
Zharktas Nov 2, 2023
116aa99
Cleanup based on review
Zharktas Nov 2, 2023
1cbaad0
Add new dev_mode module to replace setting dev mode with drupal conso…
Zharktas Nov 2, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
rm composer-setup.php
exit 1
fi
php composer-setup.php --quiet --version=2.1.14
php composer-setup.php --quiet
RESULT=$?
rm composer-setup.php
mv composer.phar /usr/local/bin/composer
Expand Down
4 changes: 3 additions & 1 deletion cypress/e2e/contact_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ describe('Test contact page', function () {
cy.get('#edit-subject-0-value').type('Some subject');
cy.get('#edit-message-0-value').type('Some content for feedback');
cy.get('#edit-submit').click();
cy.get('.messages__wrapper').contains('Viestisi on lähetetty. Vastaamme siihen mahdollisimman pian.')
// TODO: Translation is not working for some reason
bzar marked this conversation as resolved.
Show resolved Hide resolved
//cy.get('.messages__wrapper').contains('Viestisi on lähetetty. Vastaamme siihen mahdollisimman pian.')
cy.get('.messages__wrapper').contains('Viestisi on lähetetty.')
});

// Feedback with urls is currently being counted as spam, skip for now
Expand Down
15 changes: 8 additions & 7 deletions drupal/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@
"drupal/bootstrap": "^3.28",
"drupal/captcha": "^1.10",
"drupal/coder": "^8.2",
"drupal/console": "^1.0.2",
"drupal/core-composer-scaffold": "^9.2",
"drupal/core-project-message": "^9.2",
"drupal/core-recommended": "^9.2",
"drupal/core-composer-scaffold": "^10",
"drupal/core-project-message": "^10",
"drupal/core-recommended": "^10",
"drupal/ctools": "^3.11",
"drupal/domain_registration": "^1.8",
"drupal/drush_language": "1.x-dev",
Expand All @@ -51,7 +50,7 @@
"drupal/twig_tweak": "^3.2",
"drupal/unpublished_node_permissions": "^1.0",
"drupal/upgrade_status": "^4.0",
"drush/drush": "^10.0.0",
"drush/drush": "^12",
"league/commonmark": "^1.5",
"vlucas/phpdotenv": "^2.4",
"webflo/drupal-finder": "^1.0.0",
Expand All @@ -71,7 +70,8 @@
"drupal/console-extend-plugin": true,
"drupal/core-composer-scaffold": true,
"drupal/core-project-message": true,
"php-http/discovery": true
"php-http/discovery": true,
"phpstan/extension-installer": true
}
},
"extra": {
Expand Down Expand Up @@ -137,7 +137,8 @@
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
"drupal/ckeditor5_dev": "^1.0",
"drupal/core-dev": "^9.2",
"drupal/core-dev": "^10",
"drupal/dev_mode": "^2.6",
"drupal/devel": "^5.1",
"kint-php/kint": "^5.0",
"squizlabs/php_codesniffer": "^3.6"
Expand Down
Loading
Loading