Skip to content

Commit 13fdb88

Browse files
committed
test.sh: Don't include apigen/apigen in test composer.json
1 parent e0898ea commit 13fdb88

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,8 @@ docker_run() {
230230

231231
# we don't want to edit composer.json accidentally
232232
[ -s "$vendorDir/composer.json" ] || \
233-
cp -- "$workdir/composer.json" "$vendorDir/composer.json"
233+
cat "$workdir/composer.json" | grep -v 'apigen/apigen' \
234+
> "$vendorDir/composer.json"
234235

235236
# Each container has its own composer.lock file
236237
# to avoid conflicts between different PHP versions.
@@ -241,8 +242,8 @@ docker_run() {
241242
docker run --rm "-i$(tty -s && echo t)" \
242243
-u "0:$(id -g)" \
243244
-e "HOME=/app/vendor" \
244-
-e "USER=$(id -un)" \
245245
-e "UID=$(id -u)" \
246+
-e "USER=$(id -un)" \
246247
-v "$workdir:/app" \
247248
-v "$vendorDir/composer.json:/app/composer.json" \
248249
-v "$vendorDir/composer.lock:/app/composer.lock" \

0 commit comments

Comments
 (0)