Skip to content

Commit f4fa387

Browse files
committed
Use with-all-dependencies
1 parent 8401b5f commit f4fa387

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ echo ""
124124
echo "Scripts Directory: $SCRIPTS"
125125
echo "Project Directory: $ROOT"
126126
echo "Target Version: $TARGET_VERSION"
127-
echo "Current Version: $SOURCE_VERSION"
127+
echo "Current Version: $CURRENT_VERSION"
128128
echo "Source Package: $PACKAGE"
129129
echo "Base Branch: $BASE"
130130
echo "Selected Items: $ITEMS"
@@ -146,7 +146,7 @@ git clean -fd
146146

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

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

163163
# Check for a specific requested version
164164
if [ "$TARGET_VERSION" ]; then
165-
composer require --no-scripts "$PACKAGE" "$TARGET_VERSION"
165+
composer require --no-scripts --with-all-dependencies "$PACKAGE" "$TARGET_VERSION"
166166
# Otherwise get the latest
167167
else
168-
composer update --no-scripts "$PACKAGE"
168+
composer update --no-scripts --with-all-dependencies "$PACKAGE"
169169
fi
170170

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

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

191191
echo "************************************"
192192
echo "* MERGING *"

0 commit comments

Comments
 (0)