Skip to content

Commit

Permalink
Use with-all-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
MGatner committed Jan 6, 2022
1 parent 8401b5f commit f4fa387
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/patch
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ echo ""
echo "Scripts Directory: $SCRIPTS"
echo "Project Directory: $ROOT"
echo "Target Version: $TARGET_VERSION"
echo "Current Version: $SOURCE_VERSION"
echo "Current Version: $CURRENT_VERSION"
echo "Source Package: $PACKAGE"
echo "Base Branch: $BASE"
echo "Selected Items: $ITEMS"
Expand All @@ -146,7 +146,7 @@ git clean -fd

# If a current version was requested then change vendor first
if [ "$CURRENT_VERSION" ]; then
composer require --no-scripts "$PACKAGE" "$CURRENT_VERSION"
composer require --no-scripts --with-all-dependencies "$PACKAGE" "$CURRENT_VERSION"
git restore composer.*
fi

Expand All @@ -162,10 +162,10 @@ git commit -m "Stage framework" > /dev/null

# Check for a specific requested version
if [ "$TARGET_VERSION" ]; then
composer require --no-scripts "$PACKAGE" "$TARGET_VERSION"
composer require --no-scripts --with-all-dependencies "$PACKAGE" "$TARGET_VERSION"
# Otherwise get the latest
else
composer update --no-scripts "$PACKAGE"
composer update --no-scripts --with-all-dependencies "$PACKAGE"
fi

# Wipe out the current versions and copy in the new
Expand All @@ -186,7 +186,7 @@ rm composer.*
git switch -c tatter/patches "$BASE"

# Restore the original state of vendor/
composer install --no-scripts > /dev/null
composer install --no-scripts --with-all-dependencies > /dev/null

echo "************************************"
echo "* MERGING *"
Expand Down

0 comments on commit f4fa387

Please sign in to comment.