Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,13 @@ output
output "${normal}You are about to push:"
for b in "${allbranches[@]}" ; do
versionpath=version.php
if [ ! -f $versionpath ]; then
git cat-file -e origin/${b}:$versionpath > /dev/null 2>&1
if [ $? -ne 0 ]; then
versionpath=public/version.php
fi

# Search for a 'real' release by ensuring the top commit on version.php changes $release and was recent.
releasebumped=$(git show --since='8 hours ago' -n1 origin/${b} $versionpath | grep "+\$release\s*=\s*")
releasebumped=$(git show --since='8 hours ago' -n1 origin/${b} -- $versionpath | grep "+\$release\s*=\s*")
if [[ -n ${releasebumped} || $_skip_version_check ]]; then
output "${G}$b: ${normal}$(git log -n1 --pretty=format:"%s (%an %ar)" origin/$b)"
# Check if between the last commit in the branch and now, it has been PUBLISHING_TIME (UTC)
Expand Down