From 12d70091422917917b2eb997f416964ee619d1cd Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 20 Oct 2022 17:38:03 +0300 Subject: [PATCH 1/3] UHF-7046: Removed unused and conflicting breakpoints configuration file from under hdbt_subtheme and added xl-breakpoint for diagonal hero --- ...responsive_image.styles.hero__diagonal.yml | 14 +++++++ .../hdbt_subtheme.breakpoints.yml | 42 ------------------- 2 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 public/themes/custom/hdbt_subtheme/hdbt_subtheme.breakpoints.yml diff --git a/conf/cmi/responsive_image.styles.hero__diagonal.yml b/conf/cmi/responsive_image.styles.hero__diagonal.yml index 2b6bbb36..19d1f262 100644 --- a/conf/cmi/responsive_image.styles.hero__diagonal.yml +++ b/conf/cmi/responsive_image.styles.hero__diagonal.yml @@ -9,15 +9,29 @@ dependencies: - image.style.23_10_m_2x - image.style.23_10_s - image.style.23_10_s_2x + - image.style.23_10_xl + - image.style.23_10_xl_2x - image.style.23_10_xs - image.style.23_10_xs_2x - image.style.23_10_xxs - image.style.23_10_xxs_2x + theme: + - hdbt _core: default_config_hash: sqxPwEOHDHbmSWO75WNVWlTSQ5yyV_PYHC7vxrA5LoQ id: hero__diagonal label: 'Hero Diagonal' image_style_mappings: + - + image_mapping_type: image_style + image_mapping: 23_10_xl + breakpoint_id: hdbt.xl + multiplier: 1x + - + image_mapping_type: image_style + image_mapping: 23_10_xl_2x + breakpoint_id: hdbt.xl + multiplier: 2x - image_mapping_type: image_style image_mapping: 23_10_l diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.breakpoints.yml b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.breakpoints.yml deleted file mode 100644 index b5bfbf96..00000000 --- a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.breakpoints.yml +++ /dev/null @@ -1,42 +0,0 @@ -hdbt.xxs: - label: XXS - mediaQuery: 'all and (max-width: 320px)' - weight: 0 - multipliers: - - 1x - - 2x -hdbt.xs: - label: XS - mediaQuery: 'all and (min-width: 320px)' - weight: 0 - multipliers: - - 1x - - 2x -hdbt.s: - label: S - mediaQuery: 'all and (min-width: 576px)' - weight: 1 - multipliers: - - 1x - - 2x -hdbt.m: - label: M - mediaQuery: 'all and (min-width: 768px)' - weight: 2 - multipliers: - - 1x - - 2x -hdbt.l: - label: L - mediaQuery: 'all and (min-width: 992px)' - weight: 3 - multipliers: - - 1x - - 2x -hdbt.xl: - label: XL - mediaQuery: 'all and (min-width: 1248px)' - weight: 4 - multipliers: - - 1x - - 2x From 21d8c5599dc2055f173ea37e45f6bd7460148bcd Mon Sep 17 00:00:00 2001 From: tuutti Date: Fri, 21 Oct 2022 10:42:07 +0300 Subject: [PATCH 2/3] UHF-7222: Updated platform --- .github/workflows/test.yml | 12 ++++++++---- .github/workflows/update-config.yml | 4 +--- docker-compose.yml | 4 ++-- docker/openshift/Dockerfile | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02536944..6b0cc4e1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,19 +30,23 @@ jobs: - name: Build project run: composer install + - name: Check that subtheme is not built with dev mode + run: if grep -q 'sourceMappingURL=' -R public/themes/custom/hdbt_subtheme/dist/css; then exit 1; fi + - name: Run PHPCS run: | vendor/bin/phpcs public/modules/custom/ --ignore="*.js,*.css" --extensions=php,module,install --standard=Drupal vendor/bin/phpcs public/themes/custom/ --ignore="*.js,*.css" --extensions=php,theme --standard=Drupal - + - name: Download latest dump env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - gh run download -n latest.sql + run: gh run download -n latest.sql - name: Install Drupal - run: mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < latest.sql + run: | + mysql --user=drupal --password=drupal --database=drupal --host=db --port=3306 -A < latest.sql + drush cr && drush cim -y - name: Start services run: | diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml index 1a801c2c..2c595707 100644 --- a/.github/workflows/update-config.yml +++ b/.github/workflows/update-config.yml @@ -41,9 +41,7 @@ jobs: $(drush sql:connect) < latest.sql drush cr && drush cim -y composer update drupal/helfi_* drupal/hdbt* -W - drush cr - drush updb -y - drush cex -y + drush cr && drush updb -y && drush cex -y # Update platform drush helfi:tools:update-platform diff --git a/docker-compose.yml b/docker-compose.yml index 356901ec..7a87b798 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,12 +45,12 @@ services: - "traefik.docker.network=stonehenge-network" redis: container_name: "${COMPOSE_PROJECT_NAME}-redis" - image: redis:6-alpine + image: redis:7-alpine networks: - internal db: container_name: "${COMPOSE_PROJECT_NAME}-db" - image: druidfi/mariadb:10.6-drupal + image: druidfi/mariadb:10.7-drupal volumes: - db_data:/var/lib/mysql ports: diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile index 6e9980b5..16e12dea 100644 --- a/docker/openshift/Dockerfile +++ b/docker/openshift/Dockerfile @@ -1,4 +1,4 @@ -ARG DRUPAL_DOCKER_TAG=8.0 +ARG DRUPAL_DOCKER_TAG=8.1 FROM ghcr.io/city-of-helsinki/drupal-docker-base:${DRUPAL_DOCKER_TAG} COPY / /var/www/html/ From 6330c0c5938e08c691e81cdea57c777f11639a85 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 25 Oct 2022 06:06:59 +0000 Subject: [PATCH 3/3] Update configuration --- composer.lock | 162 +++++++++++----------- conf/cmi/imagecache_external.settings.yml | 5 +- 2 files changed, 88 insertions(+), 79 deletions(-) diff --git a/composer.lock b/composer.lock index 8c224a51..18489d9b 100644 --- a/composer.lock +++ b/composer.lock @@ -3792,6 +3792,10 @@ "name": "Alexander Ross (bleen)", "homepage": "https://www.drupal.org/u/bleen", "role": "Maintainer" + }, + { + "name": "Rajeshreeputra", + "homepage": "https://www.drupal.org/user/3418561" } ], "description": "Focal Point allows content creators to mark the most important part of an image for easier cropping.", @@ -3925,16 +3929,16 @@ }, { "name": "drupal/hdbt", - "version": "4.1.5", + "version": "4.1.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "50e66c665970f0998aa3b10cdbca3fd072f68443" + "reference": "adf4d958ec7234a5aa5a8f02583d5992b8d8ee26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/50e66c665970f0998aa3b10cdbca3fd072f68443", - "reference": "50e66c665970f0998aa3b10cdbca3fd072f68443", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/adf4d958ec7234a5aa5a8f02583d5992b8d8ee26", + "reference": "adf4d958ec7234a5aa5a8f02583d5992b8d8ee26", "shasum": "" }, "require": { @@ -3949,10 +3953,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.5", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.8", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-10-17T09:27:18+00:00" + "time": "2022-10-21T13:32:01+00:00" }, { "name": "drupal/hdbt_admin", @@ -3988,16 +3992,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.3.2", + "version": "2.3.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "43048a8a41a3e28cd3f8de6c6282a84bbbe09fab" + "reference": "403c56e5dc436ba0c404c240546e59de944eae2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/43048a8a41a3e28cd3f8de6c6282a84bbbe09fab", - "reference": "43048a8a41a3e28cd3f8de6c6282a84bbbe09fab", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/403c56e5dc436ba0c404c240546e59de944eae2e", + "reference": "403c56e5dc436ba0c404c240546e59de944eae2e", "shasum": "" }, "require": { @@ -4020,10 +4024,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.2", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.3", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2022-10-14T09:42:58+00:00" + "time": "2022-10-24T06:09:19+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4185,16 +4189,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.13.5", + "version": "2.13.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba" + "reference": "c8496487f8595dec1921d1e87b65650873fb7755" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba", - "reference": "567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c8496487f8595dec1921d1e87b65650873fb7755", + "reference": "c8496487f8595dec1921d1e87b65650873fb7755", "shasum": "" }, "require": { @@ -4304,23 +4308,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.5", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.6", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-10-14T11:00:01+00:00" + "time": "2022-10-19T07:23:46+00:00" }, { "name": "drupal/helfi_proxy", - "version": "2.2.7", + "version": "2.2.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "be69a56c6f4019110d3c0c68d9475827286fa6ab" + "reference": "e75e953316a551a2075ddb7edad8b09128b19723" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/be69a56c6f4019110d3c0c68d9475827286fa6ab", - "reference": "be69a56c6f4019110d3c0c68d9475827286fa6ab", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/e75e953316a551a2075ddb7edad8b09128b19723", + "reference": "e75e953316a551a2075ddb7edad8b09128b19723", "shasum": "" }, "require": { @@ -4343,10 +4347,10 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.2.7", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.2.8", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2022-09-28T05:57:53+00:00" + "time": "2022-10-25T06:04:50+00:00" }, { "name": "drupal/helfi_tpr", @@ -4471,26 +4475,26 @@ }, { "name": "drupal/imagecache_external", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/imagecache_external.git", - "reference": "3.0.0" + "reference": "3.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.0.zip", - "reference": "3.0.0", - "shasum": "8975bf8229dcfae47600502b872b01861eee1440" + "url": "https://ftp.drupal.org/files/projects/imagecache_external-3.0.1.zip", + "reference": "3.0.1", + "shasum": "f36e080a5059d760f4c47ad21ac9391f1b1ea6b3" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.3 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.0", - "datestamp": "1605799095", + "version": "3.0.1", + "datestamp": "1665918248", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4509,6 +4513,10 @@ { "name": "larowlan", "homepage": "https://www.drupal.org/user/395439" + }, + { + "name": "swentel", + "homepage": "https://www.drupal.org/user/107403" } ], "description": "Allows you to fetch external images and use image styles on them.", @@ -5714,17 +5722,17 @@ }, { "name": "drupal/search_api", - "version": "1.26.0", + "version": "1.27.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.26" + "reference": "8.x-1.27" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.26.zip", - "reference": "8.x-1.26", - "shasum": "a37f4ac23f7f0517df85fd450b4a9a50333ae93d" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.27.zip", + "reference": "8.x-1.27", + "shasum": "b8c9a055fe43435c09231fd93d3e07c5d2863a46" }, "require": { "drupal/core": "^9.3 || ^10.0" @@ -5745,8 +5753,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.26", - "datestamp": "1664975343", + "version": "8.x-1.27", + "datestamp": "1666211720", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6533,20 +6541,20 @@ }, { "name": "drupal/views_bulk_edit", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_edit.git", - "reference": "8.x-2.7" + "reference": "8.x-2.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_edit-8.x-2.7.zip", - "reference": "8.x-2.7", - "shasum": "148457820e7ecd78942326c9c799147ed440f2a6" + "url": "https://ftp.drupal.org/files/projects/views_bulk_edit-8.x-2.8.zip", + "reference": "8.x-2.8", + "shasum": "8600f5688d21d5d98e56b5f8c154997f6cb190c1" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.1 || ^10" }, "require-dev": { "drupal/views_bulk_operations": "~3.0" @@ -6557,8 +6565,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.7", - "datestamp": "1664355764", + "version": "8.x-2.8", + "datestamp": "1666257164", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6588,20 +6596,21 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.2.0", + "version": "4.2.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.2.0" + "reference": "4.2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.0.zip", - "reference": "4.2.0", - "shasum": "b18fd9a43c47ffaf20f5f888871ff801b6f9f99f" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.1.zip", + "reference": "4.2.1", + "shasum": "3bce967e24c0ce19fc7e0de031594729e22c38ef" }, "require": { - "drupal/core": "^9.4 || ^10" + "drupal/core": "^9.4 || ^10", + "php": ">=7.4.0" }, "require-dev": { "drush/drush": "^11" @@ -6612,8 +6621,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.2.0", - "datestamp": "1664360435", + "version": "4.2.1", + "datestamp": "1666185226", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6638,17 +6647,9 @@ "name": "Graber", "homepage": "https://www.drupal.org/user/1599440" }, - { - "name": "infojunkie", - "homepage": "https://www.drupal.org/user/48424" - }, { "name": "joelpittet", "homepage": "https://www.drupal.org/user/160302" - }, - { - "name": "Jon Pugh", - "homepage": "https://www.drupal.org/user/17028" } ], "description": "Adds an ability to perform bulk operations on selected entities from view results. Provides an API to create such operations.", @@ -7059,23 +7060,23 @@ }, { "name": "ezimuel/guzzlestreams", - "version": "3.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/ezimuel/guzzlestreams.git", - "reference": "abe3791d231167f14eb80d413420d1eab91163a8" + "reference": "b4b5a025dfee70d6cd34c780e07330eb93d5b997" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8", - "reference": "abe3791d231167f14eb80d413420d1eab91163a8", + "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/b4b5a025dfee70d6cd34c780e07330eb93d5b997", + "reference": "b4b5a025dfee70d6cd34c780e07330eb93d5b997", "shasum": "" }, "require": { "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~9.0" }, "type": "library", "extra": { @@ -7106,9 +7107,9 @@ "stream" ], "support": { - "source": "https://github.com/ezimuel/guzzlestreams/tree/3.0.1" + "source": "https://github.com/ezimuel/guzzlestreams/tree/3.1.0" }, - "time": "2020-02-14T23:11:50+00:00" + "time": "2022-10-24T12:58:50+00:00" }, { "name": "ezimuel/ringphp", @@ -14435,25 +14436,30 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" }, "type": "library", "extra": { @@ -14479,9 +14485,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" }, - "time": "2022-03-15T21:29:03+00:00" + "time": "2022-10-14T12:47:21+00:00" }, { "name": "phpspec/prophecy", diff --git a/conf/cmi/imagecache_external.settings.yml b/conf/cmi/imagecache_external.settings.yml index a35b8f81..3ab1ff2d 100644 --- a/conf/cmi/imagecache_external.settings.yml +++ b/conf/cmi/imagecache_external.settings.yml @@ -6,7 +6,7 @@ imagecache_external_batch_flush_limit: 1000 imagecache_external_hosts: '' imagecache_external_management: unmanaged imagecache_external_use_whitelist: true -imagecache_fallback_image: '' +imagecache_fallback_image: 0 imagecache_external_allowed_mimetypes: - image/jpg - image/jpg;charset=utf-8 @@ -19,4 +19,7 @@ imagecache_external_allowed_mimetypes: - application/octet-stream - application/octet-stream;charset=utf-8 - binary/octet-stream + - image/webp + - image/webp;charset=utf-8 imagecache_external_cron_flush_frequency: 0 +imagecache_subdirectories: false