woocommerce/bin/post-merge.sh

#!/bin/bash

changedFiles="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"

runOnChange() {
	if echo "$changedFiles" | grep -q "$1"
	then
		eval "$2"
	fi
}

runOnChange "package-lock.json" "npm run install:no-e2e"
runOnChange "composer.lock" "SKIP_UPDATE_TEXTDOMAINS=true composer install"
Introduced GIT post-merge hook to update NPM and Composer dependencies 2019-11-20 22:18:16 +00:00			`#!/bin/bash`

			`changedFiles="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"`

			`runOnChange() {`
Fix post-merge.sh exit status in some cases This commit tweaks the function runOnChange() to make sure it always returns the correct exit status. Before this change, this function would return 1 instead of 0 when there was no change to composer.lock and package-lock.json in the commits that were merged. This resulted in husky mistakenly reporting a failure when actually the post-merge script succeeded. 2020-09-18 18:36:04 +00:00			`if echo "$changedFiles" \| grep -q "$1"`
			`then`
			`eval "$2"`
			`fi`
Introduced GIT post-merge hook to update NPM and Composer dependencies 2019-11-20 22:18:16 +00:00			`}`

Improve the nmp setup process to install e2e tests only explicitly Use the "install-subset" package to define a subset of the nmp dependencies that doesn't include the e2e testing infrastructure. Also define a new npm "install:no-e2e" command, and modify the post-merge hook to use it instead of the full install. 2021-01-26 11:23:24 +00:00			`runOnChange "package-lock.json" "npm run install:no-e2e"`
Don't update text domains on the post-merge hook. 2021-01-27 15:48:25 +00:00			`runOnChange "composer.lock" "SKIP_UPDATE_TEXTDOMAINS=true composer install"`