Skip to content

Commit

Permalink
Merge pull request #1104 from Automattic/master
Browse files Browse the repository at this point in the history
Alpha release Apr 28
  • Loading branch information
dkoo authored Apr 28, 2023
2 parents d8d504d + f595046 commit bb5eb1b
Show file tree
Hide file tree
Showing 23 changed files with 1,852 additions and 251 deletions.
8 changes: 8 additions & 0 deletions .hooks/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

branch=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')

if [[ "$branch" = "master" ]]; then
echo "Error: pushing directly to the master branch is prohibited"
exit 1
fi
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"phpcompatibility/phpcompatibility-wp": "^2.1",
"composer/installers": "^2.0",
"brainmaestro/composer-git-hooks": "^2.8",
"xwp/wp-dev-lib": "^1.3",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"yoast/phpunit-polyfills": "^1.0",
"phpunit/phpunit": "^7.0 || ^9.5",
Expand All @@ -26,8 +25,9 @@
"extra": {
"hooks": {
"pre-commit": [
"./vendor/xwp/wp-dev-lib/scripts/pre-commit && ./node_modules/.bin/lint-staged"
"./node_modules/.bin/lint-staged"
],
"pre-push": "./.hooks/pre-push",
"commit-msg": [
"cat $1 | ./node_modules/.bin/commitlint"
]
Expand Down
Loading

0 comments on commit bb5eb1b

Please sign in to comment.