Merge branch 'develop' into feature/fix-views-caching-test

civictheme · Dec 7, 2023 · 26e5a69 · 26e5a69
2 parents f7a295b + 3ac3208
commit 26e5a69
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/web/themes/contrib/civictheme/.circleci/build.sh b/web/themes/contrib/civictheme/.circleci/build.sh
@@ -111,6 +111,7 @@ php -r "echo json_encode(array_replace_recursive(json_decode(file_get_contents('
 
 echo "  > Adding custom patches."
 cat <<< "$(jq --indent 4 '.extra.patches = {"drupal/core": {"Builds failing on missing layout column plugin": "https://www.drupal.org/files/issues/2023-07-16/3204271-20-missing-layout-exception.patch"}}' "${BUILD_DIR}/composer.json")" > "${BUILD_DIR}/composer.json"
+cat <<< "$(jq --indent 4 '.extra.patches += {"drupal/webform": {"webform_default permission": "https://www.drupal.org/files/issues/2023-12-06/webform-post-update-skip-when-format-is-missing-3404493-18.patch"}}' "${BUILD_DIR}/composer.json")" > "${BUILD_DIR}/composer.json"
 
 echo "  > Creating GitHub authentication token if provided."
 [ -n "${GITHUB_TOKEN:-}" ] && composer config --global github-oauth.github.com "$GITHUB_TOKEN" && echo "Token: " && composer config --global github-oauth.github.com