Skip to content

Commit f59028f

Browse files
author
Automerger
committed
Merge branch 'github/main'
2 parents d0ba51e + f27365f commit f59028f

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

settings.gradle.kts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,4 @@ include(":feature:bookmarks")
5454
include(":feature:topic")
5555
include(":lint")
5656
include(":sync:work")
57-
include(":sync:sync-test")
58-
59-
60-
val prePushHook = file(".git/hooks/pre-push")
61-
val commitMsgHook = file(".git/hooks/commit-msg")
62-
val hooksInstalled = commitMsgHook.exists()
63-
&& prePushHook.exists()
64-
&& prePushHook.readBytes().contentEquals(file("tools/pre-push").readBytes())
65-
66-
if (!hooksInstalled) {
67-
exec {
68-
commandLine("tools/setup.sh")
69-
workingDir = rootProject.projectDir
70-
}
71-
}
57+
include(":sync:sync-test")

tools/setup.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ NC='\033[0m' # No Color
2020
GIT_DIR=$(git rev-parse --git-dir 2> /dev/null)
2121
GIT_ROOT=$(git rev-parse --show-toplevel 2> /dev/null)
2222

23-
if [[ ! "$GIT_ROOT" =~ /nowinandroid$ ]]; then
24-
echo -e "${RED}ERROR:${NC} Please run this script from the cloned nowinandroid directory."
25-
exit 1
26-
fi
27-
2823
echo "Installing git commit-message hook"
2924
echo
3025
curl -sSLo "${GIT_DIR}/hooks/commit-msg" \

0 commit comments

Comments
 (0)