From b208ebb10090f2efea917c2ecf444c2608cfcc08 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Tue, 6 Jun 2023 20:40:54 +0000 Subject: [PATCH 1/3] 9.4.22 --- .../humsci_default_content/humsci_default_content.info.yml | 2 +- .../humsci_events_listeners/humsci_events_listeners.info.yml | 2 +- .../humsci/su_humsci_profile/su_humsci_profile.info.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml index 041300ef5e..44900fba4b 100644 --- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml @@ -3,7 +3,7 @@ description: 'DO NOT INSTALL. This is for profile installation task only.' core_version_requirement: '^9.4 || ^10' hidden: true type: module -version: 9.4.21 +version: 9.4.22 default_content: shortcut: - 0c69448d-c6fa-4fb8-9b2e-f93f3a955baf diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml index eb62d2cffe..e71cbaf01b 100644 --- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml @@ -14,4 +14,4 @@ dependencies: - 'hook_event_dispatcher:toolbar_event_dispatcher' - 'hook_event_dispatcher:user_event_dispatcher' - 'hook_event_dispatcher:views_event_dispatcher' -version: 9.4.21 +version: 9.4.22 diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index 9f031d0072..6a435ea050 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -1,7 +1,7 @@ name: 'Stanford HumSci' type: profile description: 'Installation profile for HumSci Drupal' -version: 9.4.21 +version: 9.4.22 core_version_requirement: '^9.4 || ^10' themes: - material_admin From c52a1012388ecba50939acf16388eb8dc064cec7 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Wed, 7 Jun 2023 14:09:26 +0000 Subject: [PATCH 2/3] Updated dependencies Jun 7 2023 --- composer.lock | 117 ++++++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 56 deletions(-) diff --git a/composer.lock b/composer.lock index fef3c4bc11..6cf93b5493 100644 --- a/composer.lock +++ b/composer.lock @@ -1753,25 +1753,29 @@ }, { "name": "doctrine/deprecations", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "8cffffb2218e01f3b370bf763e00e81697725259" + "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/8cffffb2218e01f3b370bf763e00e81697725259", - "reference": "8cffffb2218e01f3b370bf763e00e81697725259", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "psr/log": "^1|^2|^3" + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -1790,9 +1794,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.0" + "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" }, - "time": "2023-05-29T18:55:17+00:00" + "time": "2023-06-03T09:27:29+00:00" }, { "name": "doctrine/lexer", @@ -2805,17 +2809,17 @@ }, { "name": "drupal/blazy", - "version": "2.15.0", + "version": "2.16.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/blazy.git", - "reference": "8.x-2.15" + "reference": "8.x-2.16" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/blazy-8.x-2.15.zip", - "reference": "8.x-2.15", - "shasum": "f140917d3a9c26e504f841ac7fbcb3030bbec686" + "url": "https://ftp.drupal.org/files/projects/blazy-8.x-2.16.zip", + "reference": "8.x-2.16", + "shasum": "ae84ac6083f734968eb9c7cc008b32aaa04c5b9c" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -2826,8 +2830,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.15", - "datestamp": "1684213155", + "version": "8.x-2.16", + "datestamp": "1685788557", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10996,17 +11000,17 @@ }, { "name": "drupal/slick", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/slick.git", - "reference": "8.x-2.8" + "reference": "8.x-2.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/slick-8.x-2.8.zip", - "reference": "8.x-2.8", - "shasum": "772a45f6f9341b2e231e6b2008315ca0a10e106f" + "url": "https://ftp.drupal.org/files/projects/slick-8.x-2.9.zip", + "reference": "8.x-2.9", + "shasum": "1c2cec19148a096f875390e2fd6a9e56caf5bacd" }, "require": { "drupal/blazy": ">=2.14", @@ -11015,8 +11019,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.8", - "datestamp": "1684219580", + "version": "8.x-2.9", + "datestamp": "1685789618", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -13062,16 +13066,16 @@ }, { "name": "egulias/email-validator", - "version": "3.2.5", + "version": "3.2.6", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "b531a2311709443320c786feb4519cfaf94af796" + "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b531a2311709443320c786feb4519cfaf94af796", - "reference": "b531a2311709443320c786feb4519cfaf94af796", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7", + "reference": "e5997fa97e8790cdae03a9cbd5e78e45e3c7bda7", "shasum": "" }, "require": { @@ -13117,7 +13121,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.2.5" + "source": "https://github.com/egulias/EmailValidator/tree/3.2.6" }, "funding": [ { @@ -13125,7 +13129,7 @@ "type": "github" } ], - "time": "2023-01-02T17:26:14+00:00" + "time": "2023-06-01T07:04:22+00:00" }, { "name": "eluceo/ical", @@ -16236,16 +16240,16 @@ }, { "name": "simplesamlphp/saml2", - "version": "4.6.9", + "version": "v4.6.10", "source": { "type": "git", "url": "https://github.com/simplesamlphp/saml2.git", - "reference": "1b4bf05073bcf7f7d9989a3fdf679eae24ab4df0" + "reference": "a6c46e8134df2686da9ad44bc9b8f85443c03440" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/1b4bf05073bcf7f7d9989a3fdf679eae24ab4df0", - "reference": "1b4bf05073bcf7f7d9989a3fdf679eae24ab4df0", + "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/a6c46e8134df2686da9ad44bc9b8f85443c03440", + "reference": "a6c46e8134df2686da9ad44bc9b8f85443c03440", "shasum": "" }, "require": { @@ -16288,9 +16292,9 @@ "description": "SAML2 PHP library from SimpleSAMLphp", "support": { "issues": "https://github.com/simplesamlphp/saml2/issues", - "source": "https://github.com/simplesamlphp/saml2/tree/4.6.9" + "source": "https://github.com/simplesamlphp/saml2/tree/v4.6.10" }, - "time": "2023-05-31T07:31:03+00:00" + "time": "2023-05-31T16:03:51+00:00" }, { "name": "simplesamlphp/simplesamlphp", @@ -23006,16 +23010,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.5", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd" + "reference": "90d087e988ff194065333d16bc5cf649872d9cdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/74780ccf8c19d6acb8d65c5f39cd72110e132bbd", - "reference": "74780ccf8c19d6acb8d65c5f39cd72110e132bbd", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/90d087e988ff194065333d16bc5cf649872d9cdb", + "reference": "90d087e988ff194065333d16bc5cf649872d9cdb", "shasum": "" }, "require": { @@ -23062,7 +23066,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.5" + "source": "https://github.com/composer/ca-bundle/tree/1.3.6" }, "funding": [ { @@ -23078,7 +23082,7 @@ "type": "tidelift" } ], - "time": "2023-01-11T08:27:00+00:00" + "time": "2023-06-06T12:02:59+00:00" }, { "name": "composer/composer", @@ -25471,22 +25475,23 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.21.3", + "version": "1.22.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "b0c366dd2cea79407d635839d25423ba07c55dd6" + "reference": "ec58baf7b3c7f1c81b3b00617c953249fb8cf30c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/b0c366dd2cea79407d635839d25423ba07c55dd6", - "reference": "b0c366dd2cea79407d635839d25423ba07c55dd6", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/ec58baf7b3c7f1c81b3b00617c953249fb8cf30c", + "reference": "ec58baf7b3c7f1c81b3b00617c953249fb8cf30c", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { + "doctrine/annotations": "^2.0", "nikic/php-parser": "^4.15", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", @@ -25511,22 +25516,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.21.3" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.0" }, - "time": "2023-05-29T19:31:28+00:00" + "time": "2023-06-01T12:35:21+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.15", + "version": "1.10.16", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd" + "reference": "352bdbb960bb523e3d71b834862589f910921c23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/762c4dac4da6f8756eebb80e528c3a47855da9bd", - "reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/352bdbb960bb523e3d71b834862589f910921c23", + "reference": "352bdbb960bb523e3d71b834862589f910921c23", "shasum": "" }, "require": { @@ -25575,7 +25580,7 @@ "type": "tidelift" } ], - "time": "2023-05-09T15:28:01+00:00" + "time": "2023-06-05T08:21:46+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -27294,12 +27299,12 @@ "source": { "type": "git", "url": "https://github.com/SU-SWS/stanford-caravan.git", - "reference": "f7cd6bb0ff4e4bc0c599161910a368a6802282e1" + "reference": "85aa013d821ab9d58300c80cbc1e5d05e2978b7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/stanford-caravan/zipball/f7cd6bb0ff4e4bc0c599161910a368a6802282e1", - "reference": "f7cd6bb0ff4e4bc0c599161910a368a6802282e1", + "url": "https://api.github.com/repos/SU-SWS/stanford-caravan/zipball/85aa013d821ab9d58300c80cbc1e5d05e2978b7c", + "reference": "85aa013d821ab9d58300c80cbc1e5d05e2978b7c", "shasum": "" }, "require": { @@ -27328,7 +27333,7 @@ "issues": "https://github.com/SU-SWS/stanford-caravan/issues", "source": "https://github.com/SU-SWS/stanford-caravan/tree/8.x-3.x" }, - "time": "2023-03-17T02:42:15+00:00" + "time": "2023-06-07T00:33:00+00:00" }, { "name": "symfony/browser-kit", From 3532e96a8f39bf43dd569b50a3987b1873c96ec4 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Wed, 7 Jun 2023 10:49:30 -0700 Subject: [PATCH 3/3] Removed patch that was fixed --- .github/workflows/label.yml | 36 +++++++++++++++++++++++++----------- composer.json | 1 - 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index a19c16a2ca..0004537559 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -1,20 +1,34 @@ -# This workflow will triage pull requests and apply a label based on the -# paths that are modified in the pull request. -# -# To use this workflow, you will need to set up a .github/labeler.yml -# file with configuration. For more information, see: -# https://github.com/actions/labeler/blob/master/README.md +# .github/workflows/release.yml +name: Release -name: PR Labeler on: pull_request: - types: [opened, synchronize] + types: [closed] jobs: - pr-labeler: + build: runs-on: ubuntu-latest + permissions: write-all + if: github.event.pull_request.merged steps: - - uses: actions/checkout@v2 - - uses: banyan/auto-label@1.2 + - name: Get Next Release + id: tag + uses: K-Phoen/semver-release-action@master + with: + release_strategy: none + release_branch: main + tag_format: "%major%.%minor%.%patch%" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: echo 'Creating new release for ' ${{ steps.tag.outputs.tag }} + - name: Create Release + if: ${{ steps.tag.outputs.tag }} + uses: ncipollo/release-action@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + name: ${{ steps.tag.outputs.tag }} + tag: ${{ steps.tag.outputs.tag }} + commit: ${{ github.sha }} + generateReleaseNotes: true + makeLatest: true diff --git a/composer.json b/composer.json index b1a26c4172..4cfb304fed 100644 --- a/composer.json +++ b/composer.json @@ -349,7 +349,6 @@ "https://www.drupal.org/project/key/issues/2980072": "patches/contrib/key-encrypt-2980072-4.patch" }, "drupal/menu_position": { - "https://www.drupal.org/project/menu_position/issues/3110502": "https://www.drupal.org/files/issues/2020-07-29/drupal-menu_position-WSOD-when-menu-parent-no-longer-exists-3110502-26.patch", "Clean menu tree": "patches/contrib/menu_postion_rule-edit_route.patch" }, "drupal/menu_trail_by_path": {