From b7cfadb4cc16050be69747f94d244e2e64e057e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentino=20Me=C4=91imorec?= Date: Wed, 1 Nov 2023 23:06:53 +0100 Subject: [PATCH] Add additional check for core package --- action.yml | 2 +- drupal-update.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 862a735..7b51c0c 100644 --- a/action.yml +++ b/action.yml @@ -10,7 +10,7 @@ inputs: required: false default: 'semver-safe-update' update_core: - description: 'Skip checking for Drupal core updates. Default false' + description: 'Skip checking for Drupal core updates. Default true' required: false default: 'true' update_exclude: diff --git a/drupal-update.sh b/drupal-update.sh index 4b29143..39002cb 100644 --- a/drupal-update.sh +++ b/drupal-update.sh @@ -296,7 +296,12 @@ done # It should be passable between same major versions of D10. if [ "$UPDATE_CORE" == true ]; then CORE_PACKAGE=$(echo "${UPDATES}" | jq -c '.locked[] | select(.name == "drupal/core")') - update_project "$CORE_PACKAGE" SUMMARY_OUTPUT_TABLE SUMMARY_INSTRUCTIONS + if [ -z "$CORE_PACKAGE" ] || [ "$CORE_PACKAGE" == null ]; then + CORE_PACKAGE=$(echo "${UPDATES}" | jq -c '.locked[] | select(.name == "drupal/core-recommended")') + fi + if [ "$CORE_PACKAGE" ]; then + update_project "$CORE_PACKAGE" SUMMARY_OUTPUT_TABLE SUMMARY_INSTRUCTIONS + fi fi SUMMARY_INSTRUCTIONS+="\n$SUMMARY_OUTPUT_TABLE"