Extra daily.sh safety (#9821)
If the php update channel check fails, it returns an error code 255... This isn't handled by daily.sh, so it doesn't update code at all. If updates are disabled (0), skip. If master (1) or in the php version jail do a git pull update Otherwise update to the latest tagged release This should give a "safe" fallback if php isn't working. Might cause flipping back and forth if the user's error isn't (or can't be) fixed by code changes.
This commit is contained in:
parent
5d3a286833
commit
96d65d1cc3
2
daily.sh
2
daily.sh
|
@ -211,7 +211,7 @@ main () {
|
|||
status_run 'Updating to latest codebase' 'git pull --quiet' 'update'
|
||||
update_res=$?
|
||||
new_ver=$(git rev-parse --short HEAD)
|
||||
elif [[ "$up" == "3" ]]; then
|
||||
else
|
||||
# Update to last Tag
|
||||
old_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))
|
||||
status_run 'Updating to latest release' 'git fetch --tags && git checkout $(git describe --tags $(git rev-list --tags --max-count=1))' 'update'
|
||||
|
|
Loading…
Reference in New Issue