Skip to content

Commit

Permalink
Pass correct patch filename to git apply
Browse files Browse the repository at this point in the history
It has been renamed in 5f16759
  • Loading branch information
greg0ire committed Aug 12, 2021
1 parent f4079ae commit 6b830e7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -18,11 +18,11 @@ test-fix: vendor
@if [ -f "$(PATCH_FILE)" ]; then git apply -R $(PATCH_FILE) ; fi

update-compatibility-patch-74:
@git apply tests/php-compatibility.patch
@git apply tests/php74-compatibility.patch
@printf "Please open your editor and apply your changes\n"
@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
@git diff -- tests/expected_report.txt tests/fixed > .tmp-patch && mv .tmp-patch tests/php-compatibility.patch && git apply -R tests/php-compatibility.patch
@git commit -m 'Update compatibility patch' tests/php-compatibility.patch
@git diff -- tests/expected_report.txt tests/fixed > .tmp-patch && mv .tmp-patch tests/php74-compatibility.patch && git apply -R tests/php74-compatibility.patch
@git commit -m 'Update compatibility patch' tests/php74-compatibility.patch

update-compatibility-patch-80:
@git apply tests/php80-compatibility.patch
Expand Down

0 comments on commit 6b830e7

Please sign in to comment.