Project

General

Profile

« Previous | Next » 

Revision 0b0ef57e

Added by Renato Botelho almost 10 years ago

Deduplicate git_last_commit()

View differences:

tools/build_snapshots.sh
92 92
echo "" > $SNAPSHOTSLOGFILE
93 93
echo "" > $SNAPSHOTSLASTUPDATE
94 94

  
95
git_last_commit() {
96
	if [ -d "${1}/.git" ]; then
97
		git -C "${1}" pull -q
98
		git -C "${1}" log -1 --format='%H'
99
	fi
100
}
101

  
102 95
# This routine is called in between runs. We
103 96
# will sleep for a bit and check for new commits
104 97
# in between sleeping for short durations.
......
106 99
	COUNTER=0
107 100
	while [ $COUNTER -lt $maxsleepvalue ]; do
108 101
		sleep 60
109
		CURRENT_COMMIT=$(git_last_commit "${BUILDER_ROOT}")
102
		# Update this repo
103
		git -C "${BUILDER_ROOT}" pull -q
104
		git_last_commit
110 105
		if [ "${LAST_COMMIT}" != "${CURRENT_COMMIT}" ]; then
111 106
			update_status ">>> New commit: $CURRENT_AUTHOR - $CURRENT_COMMIT .. No longer sleepy."
112 107
			COUNTER=$(($maxsleepvalue + 60))
tools/builder_common.sh
55 55
}
56 56

  
57 57
git_last_commit() {
58
	CURRENT_COMMIT=$(git -C ${BUILDER_ROOT} log -1 --format='%H')
59
	CURRENT_AUTHOR=$(git -C ${BUILDER_ROOT} log -1 --format='%an')
58
	export CURRENT_COMMIT=$(git -C ${BUILDER_ROOT} log -1 --format='%H')
59
	export CURRENT_AUTHOR=$(git -C ${BUILDER_ROOT} log -1 --format='%an')
60 60
	echo ">>> Last known commit $CURRENT_AUTHOR - $CURRENT_COMMIT"
61 61
	echo "$CURRENT_COMMIT" > $SCRATCHDIR/build_commit_info.txt
62 62
}

Also available in: Unified diff