Skip to content

Commit

Permalink
Release 11.2.0 (#16)
Browse files Browse the repository at this point in the history
* Release 11.2.0

* updated lock file

* fixup

* updated some modules

* updated github workflow

* update to tagged profile version
  • Loading branch information
imonroe authored Oct 30, 2024
1 parent 4d93b2f commit 6bb79d7
Show file tree
Hide file tree
Showing 9 changed files with 1,722 additions and 1,355 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2

# PHPStan's baseline uses tabs instead of spaces.
core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php

# Define binary file attributes.
# - Do not treat them as text.
# - Include binary diff in patches instead of "binary files differ."
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
- 33306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Restore Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
vendor
Expand All @@ -45,7 +45,7 @@ jobs:
blt blt:telemetry:disable --no-interaction
blt tests:phpunit:coverage --no-interaction
- name: Save Test Results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: unit-tests-results
Expand All @@ -72,9 +72,9 @@ jobs:
- 33306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Restore Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
vendor
Expand All @@ -101,7 +101,7 @@ jobs:
drush xmlsitemap:rebuild
blt codeception --suite=acceptance
- name: Save Test Results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: acceptance-tests-results
Expand Down Expand Up @@ -132,9 +132,9 @@ jobs:
- 33306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Restore Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
vendor
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,6 @@ drush/sites/.checksums

# Ddev
docroot/sites/*/settings/settings.ddev.php

# notes
ian-notes.txt
31 changes: 20 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
"cweagans/composer-patches": "^1.6",
"drupal/acquia_connector": "^4.x-dev@dev",
"drupal/acquia_purge": "^1.1",
"drupal/core": "^10.1",
"drupal/core": "10.2.5",
"drupal/core-composer-scaffold": "^10.1",
"drupal/core-recommended": "^10.1",
"drupal/mysql56": "^1.1",
"drupal/paranoia": "^1.9",
"drush/drush": "^12.4",
"su-sws/stanford_profile": "11.x-dev",
"su-sws/vpge_profile": "^11.1"
"su-sws/vpge_profile": "11.2.1"
},
"require-dev": {
"acquia/blt-drupal-test": "^1.0",
Expand All @@ -63,14 +63,18 @@
"drupal/coder": "*"
},
"conflict": {
"drupal/drupal": "*"
"drupal/drupal": "*",
"seboettg/collection": ">=4.0.0"
},
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"sort-packages": true,
"discard-changes": true,
"allow-plugins": true
"allow-plugins": true,
"preferred-install": {
"su-sws/vpge_profile": "source"
}
},
"extra": {
"drupal-scaffold": {
Expand Down Expand Up @@ -136,17 +140,23 @@
"enable-patching": true,
"patches": {
"drupal/core": {
"https://www.drupal.org/node/2833734": "https://www.drupal.org/files/issues/2020-11-29/2833734-allow-attachment-pager-42.patch",
"https://www.drupal.org/node/2858890": "https://git.drupalcode.org/project/drupal/-/merge_requests/4242.patch"
"https://www.drupal.org/project/drupal/issues/3151977": "patches/media-recursion-limit.patch",
"https://www.drupal.org/project/drupal/issues/3413508": "patches/core-3413508.patch"
},
"drupal/paranoia": {
"https://stanfordits.atlassian.net/browse/D8CORE-1351": "patches/contrib/paranoia.patch"
},
"drupal/ui_patterns": {
"Ui Patterns Views Fixes": "patches/contrib/ui_patterns_views-preview.patch"
},
"drupal/taxonomy_entity_index": {
"Fix PHP 8 strict error with arrays": "patches/contrib/taxonomy_entity_index.patch"
},
"drupal/google_tag": {
"Prevent google tag conflict": "patches/contrib/google_tag-ga_conflict.patch"
"Comment out GA conflict in Google Tag": "patches/contrib/google_tag-ga_conflict.patch"
},
"seboettg/citeproc-php": {
"D8CORE-6866 Non Numeric pages for citation generator": "patches/contrib/citeproc-pages.patch"
}
}
},
Expand All @@ -157,8 +167,7 @@
],
"init-lando": [
"cp lando/example.local.blt.yml blt/local.blt.yml",
"blt blt:init:settings",
"blt source:build:simplesamlphp-config"
"blt blt:init:settings"
],
"new-build": [
"cp lando/example.local.blt.yml blt/local.blt.yml",
Expand All @@ -174,8 +183,8 @@
"drush -y rsync @diversityworks.prod:%files @diversityworks.local:%files"
],
"sync-dbs": [
"drush -y sql:sync @default.local @default.test",
"drush -y rsync @default.local:%files @default.test:%files"
"drush -y sql:sync @default.dev @default.local",
"drush -y sql:sync @diversityworks.dev @diversityworks.local"
]
},
"autoload": {
Expand Down
Loading

0 comments on commit 6bb79d7

Please sign in to comment.