From 52a3f7ffc0f15943c99e5d0518c5fd32b5551919 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Nov 2025 10:35:13 +0000 Subject: [PATCH 1/5] build(deps): bump js-yaml from 4.1.0 to 4.1.1 in /sites/platform Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 4.1.0 to 4.1.1. - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/4.1.0...4.1.1) --- updated-dependencies: - dependency-name: js-yaml dependency-version: 4.1.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- sites/platform/package-lock.json | 11 +++++++---- sites/platform/package.json | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sites/platform/package-lock.json b/sites/platform/package-lock.json index 979c7779c5..5f215495a1 100644 --- a/sites/platform/package-lock.json +++ b/sites/platform/package-lock.json @@ -20,7 +20,7 @@ "axios": "^1.8.2", "express": "^4.21.2", "fs-extra": "^11.1.1", - "js-yaml": "^4.1.0", + "js-yaml": "^4.1.1", "mermaid": "^11.10.0", "octokit": "^3.1.2", "platformsh-config": "^2.4.1", @@ -9269,8 +9269,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.1.0", - "license": "MIT", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dependencies": { "argparse": "^2.0.1" }, @@ -23657,7 +23658,9 @@ "version": "4.0.0" }, "js-yaml": { - "version": "4.1.0", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "requires": { "argparse": "^2.0.1" } diff --git a/sites/platform/package.json b/sites/platform/package.json index 6b1acc881f..ea56f59eda 100644 --- a/sites/platform/package.json +++ b/sites/platform/package.json @@ -45,7 +45,7 @@ "axios": "^1.8.2", "express": "^4.21.2", "fs-extra": "^11.1.1", - "js-yaml": "^4.1.0", + "js-yaml": "^4.1.1", "mermaid": "^11.10.0", "octokit": "^3.1.2", "platformsh-config": "^2.4.1", From 6bef9ced13e0912c7c6b1f2f1aefb3ba395eef12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Nov 2025 22:24:51 +0000 Subject: [PATCH 2/5] build(deps): bump scrapy from 2.11.2 to 2.13.4 in /search Bumps [scrapy](https://github.com/scrapy/scrapy) from 2.11.2 to 2.13.4. - [Release notes](https://github.com/scrapy/scrapy/releases) - [Changelog](https://github.com/scrapy/scrapy/blob/master/docs/news.rst) - [Commits](https://github.com/scrapy/scrapy/compare/2.11.2...2.13.4) --- updated-dependencies: - dependency-name: scrapy dependency-version: 2.13.4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- search/poetry.lock | 29 ++++++++++++++--------------- search/pyproject.toml | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/search/poetry.lock b/search/poetry.lock index 98d03059ab..f2a3185c87 100644 --- a/search/poetry.lock +++ b/search/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand. [[package]] name = "annotated-types" @@ -955,36 +955,35 @@ six = "*" [[package]] name = "scrapy" -version = "2.11.2" +version = "2.13.4" description = "A high-level Web Crawling and Web Scraping framework" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" groups = ["main"] files = [ - {file = "Scrapy-2.11.2-py2.py3-none-any.whl", hash = "sha256:4be353d6abbb942a9f7e7614ca8b5f3d9037381176ac8d8859c8cac676e74fa0"}, - {file = "scrapy-2.11.2.tar.gz", hash = "sha256:dfbd565384fc3fffeba121f5a3a2d0899ac1f756d41432ca0879933fbfb3401d"}, + {file = "scrapy-2.13.4-py3-none-any.whl", hash = "sha256:9bf36700aefa4983cc48b2cb0e1564161a340e19f73862778e2ed44ec5bbde6a"}, + {file = "scrapy-2.13.4.tar.gz", hash = "sha256:e09bce40c56b56f9f86b0d078a0e5cdd08283c83076170ce7a8eec7189ac2493"}, ] [package.dependencies] -cryptography = ">=36.0.0" +cryptography = ">=37.0.0" cssselect = ">=0.9.1" defusedxml = ">=0.7.1" itemadapter = ">=0.1.0" itemloaders = ">=1.0.1" -lxml = ">=4.4.1" +lxml = ">=4.6.0" packaging = "*" parsel = ">=1.5.0" protego = ">=0.1.15" -PyDispatcher = {version = ">=2.0.5", markers = "platform_python_implementation == \"CPython\""} -pyOpenSSL = ">=21.0.0" -PyPyDispatcher = {version = ">=2.1.0", markers = "platform_python_implementation == \"PyPy\""} +pydispatcher = {version = ">=2.0.5", markers = "platform_python_implementation == \"CPython\""} +pyopenssl = ">=22.0.0" +pypydispatcher = {version = ">=2.1.0", markers = "platform_python_implementation == \"PyPy\""} queuelib = ">=1.4.2" service-identity = ">=18.1.0" -setuptools = "*" tldextract = "*" -Twisted = ">=18.9.0" +twisted = ">=21.7.0,<=25.5.0" w3lib = ">=1.17.0" -"zope.interface" = ">=5.1.0" +zope-interface = ">=5.1.0" [[package]] name = "service-identity" @@ -1069,7 +1068,7 @@ description = "A lil' TOML parser" optional = false python-versions = ">=3.7" groups = ["main"] -markers = "python_version < \"3.11\"" +markers = "python_version == \"3.10\"" files = [ {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, @@ -1204,4 +1203,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.1" python-versions = "^3.10" -content-hash = "5a4133db22b0c659fd9bd0297b30c0054fb401053249d70b65eff5ff89863a09" +content-hash = "e35928349817110535877a7e7aca9146ede00beba93c5c31c8ab46a47dbd413f" diff --git a/search/pyproject.toml b/search/pyproject.toml index 171f865827..98c1fc5793 100644 --- a/search/pyproject.toml +++ b/search/pyproject.toml @@ -8,7 +8,7 @@ license = "Attribution-ShareAlike 4.0 International" [tool.poetry.dependencies] python = "^3.10" cryptography = "^44.0.1" -Scrapy = "^2.11.2" +Scrapy = "^2.13.4" meilisearch = "^0.24.0" platformshconfig = "^2.3.1" PyYAML = "^6.0" From 334639d572d8a9c118171c7ea02808ddd09d4203 Mon Sep 17 00:00:00 2001 From: Paul Gilzow Date: Wed, 19 Nov 2025 11:18:08 -0600 Subject: [PATCH 3/5] adds perplexity.ai to ignore list --- linkcheckerrc | 1 + sites/platform/src/development/email.md | 4 ++-- sites/upsun/src/development/email.md | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/linkcheckerrc b/linkcheckerrc index f958826665..9ed39c66bf 100644 --- a/linkcheckerrc +++ b/linkcheckerrc @@ -31,4 +31,5 @@ ignoreerrors= ^https://www.baeldung.com/maven-wrapper$ ^403 Forbidden ^https://dzone\.com/.*$ ^403 Forbidden ^https://docs\.pimcore\.com/.*$ ^403 Forbidden + ^https://(?:www\.)?perplexity\.ai/.*$ ^403 Forbidden ^https:// ^ReadTimeout diff --git a/sites/platform/src/development/email.md b/sites/platform/src/development/email.md index 01893ef889..a4bf519638 100644 --- a/sites/platform/src/development/email.md +++ b/sites/platform/src/development/email.md @@ -57,7 +57,7 @@ Changing the setting rebuilds the environment. ## 2. Recommended: Improve deliverability -Improve deliverability of your email with [Sender Policy Framework (SPF)](https://docs.sendgrid.com/ui/account-and-settings/spf-records). +Improve deliverability of your email with [Sender Policy Framework (SPF)](https://www.twilio.com/docs/sendgrid/glossary/spf). If you don't have an SPF record, add the following `TXT` record to your domain's DNS records: ```txt @@ -76,7 +76,7 @@ If you're on an Enterprise or Elite plan, you can request for DomainKeys Identified Mail (DKIM) to be enabled on your domain. DKIM improves your delivery rate as an email sender. -Learn more about [how DKIM works](https://docs.sendgrid.com/glossary/dkim). +Learn more about [how DKIM works](https://www.twilio.com/docs/sendgrid/glossary/dkim). To have DKIM enabled for your domain: diff --git a/sites/upsun/src/development/email.md b/sites/upsun/src/development/email.md index 7f5a3252d0..9c4124c585 100644 --- a/sites/upsun/src/development/email.md +++ b/sites/upsun/src/development/email.md @@ -58,7 +58,7 @@ Changing the setting rebuilds the environment. ## 2. Recommended: Improve deliverability -Improve deliverability of your email with [Sender Policy Framework (SPF)](https://docs.sendgrid.com/ui/account-and-settings/spf-records). +Improve deliverability of your email with [Sender Policy Framework (SPF)](https://www.twilio.com/docs/sendgrid/glossary/spf). If you don't have an SPF record, add the following `TXT` record to your domain's DNS records: ```txt @@ -74,7 +74,7 @@ If you already have an SPF record, please add SendGrid into your existing record You can request for DomainKeys Identified Mail (DKIM) to be enabled on your domain. DKIM improves your delivery rate as an email sender. -Learn more about [how DKIM works](https://docs.sendgrid.com/glossary/dkim). +Learn more about [how DKIM works](https://www.twilio.com/docs/sendgrid/glossary/dkim). To have DKIM enabled for your domain: From 6967b56a0e6a6e5a192d5357b2ac760bf9550b69 Mon Sep 17 00:00:00 2001 From: Paul Gilzow Date: Fri, 21 Nov 2025 12:04:32 -0600 Subject: [PATCH 4/5] adds 9.9 to supported versions of SOLR for DG2. Closes #5212 --- shared/data/registry.json | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/data/registry.json b/shared/data/registry.json index f091115de8..7185d7d92e 100644 --- a/shared/data/registry.json +++ b/shared/data/registry.json @@ -1220,6 +1220,7 @@ }, "versions-dedicated-gen-2": { "supported": [ + "9.9", "9.7", "9.6", "9.4", From c187efd6d135700d851318fb634e5f35b47dd393 Mon Sep 17 00:00:00 2001 From: Paul Gilzow Date: Fri, 21 Nov 2025 12:24:20 -0600 Subject: [PATCH 5/5] hacks around recent change to reported status results. Related to #5211 --- search/post_deploy.sh | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/search/post_deploy.sh b/search/post_deploy.sh index d729c0d3c4..a06d31a711 100755 --- a/search/post_deploy.sh +++ b/search/post_deploy.sh @@ -20,11 +20,11 @@ getDocsData() { # remove the previous headers log if [ -f "data/platform-headers.txt" ]; then - rm data/platform-headers.txt + rm data/platform-headers.txt || echo "Failed to delete platform-headers.txt" fi if [ -f "data/upsun-headers.txt" ]; then - rm data/upsun-headers.txt + rm data/upsun-headers.txt || echo "Failed to delete upsun-headers.txt" fi # Get the updated index for docs @@ -61,26 +61,26 @@ getDocsData() { fi # Delete templates index in the mount if it exists - rm -f data/platform_templates.yaml - rm -f data/upsun_templates.yaml + rm -f data/platform_templates.yaml || echo "Failed to delete platform_templates.yaml" + rm -f data/upsun_templates.yaml || echo "Failed to delete upsun_templates.yaml" # Get the updated index for templates - curl -s "${PLATFORM_DOCS_URL}files/indexes/templates.yaml" >> data/platform_templates.yaml + curl -s "${PLATFORM_DOCS_URL}files/indexes/templates.yaml" >> data/platform_templates.yaml || echo "Failed to retrieve templates.yaml" # @todo: For now, reuse the same index. To be removed entirely. - cp data/platform_templates.yaml data/upsun_templates.yaml + cp data/platform_templates.yaml data/upsun_templates.yaml || echo "Failed to copy templates.yaml" } update_index(){ echo "* UPDATING INDEX" POETRY_LOCATION=/app/.local/bin/poetry # Create indices for templates and docs - $POETRY_LOCATION run python createPrimaryIndex.py platform - $POETRY_LOCATION run python createPrimaryIndex.py upsun + $POETRY_LOCATION run python createPrimaryIndex.py platform || echo "Failed to run CreatePrimayIndex for platform" + $POETRY_LOCATION run python createPrimaryIndex.py upsun || echo "Failed to run CreatePrimayIndex for upsun" # Update indexes - $POETRY_LOCATION run python main.py platform - $POETRY_LOCATION run python main.py upsun + $POETRY_LOCATION run python main.py platform || echo "Failed to run main.py for platform" + $POETRY_LOCATION run python main.py upsun || echo "Failed to run main.py for upsun" } save_headers() { @@ -88,14 +88,21 @@ save_headers() { timestamp=$(date +%Y-%m-%d-%H-%M-%S) if [ -f "./data/${docs}-headers.txt" ]; then #rename the file so we can examine it - mv "./data/${docs}-headers.txt" "./data/${docs}-headers-${timestamp}.txt" + mv "./data/${docs}-headers.txt" "./data/${docs}-headers-${timestamp}.txt" || printf "Failed to rename %s\n" "${docs}-headers.txt" echo "Header responses for ${docs} saved." else echo "Header response log file for ${docs} is missing! Unable to save." fi } -set -e +# 20251121 - PFG - Product changed how results for activities are reported. If this post deploy script exits with anything +# other than 0 - say an exit 60 because curl hit a cert issue - then the deploy/activate activity is marked as a failure. +# given the state of the environment's deployment is more important than the success of this post-deploy script, the +# suggestion is that we make sure scripts exit with 0. It's possible they will change this behavior, so for now, we'll +# remove set -e to prevent the script from exiting and prevent us from determining if the environment deployed. Our E2E +# tests should catch if the indexes failed to generate correctly. Once they change the behavior, we should be able to +# come back here and re-enable set -e +# set -e cleanup @@ -109,3 +116,4 @@ cleanup getDocsData update_index +exit 0