You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
* Make pre-build.py re-runnable on Windows
pre-build.py couldn't be run twice. On the second run, the
git pull failed with
Directory /git/gpu_performance_api/external/Lib/AMD/ADL exists.
Using 'git pull' to get latest
You are not currently on a branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull <remote> <branch>
'git pull' failed with returncode:
This happens because the previous run intentionally checks
out a specific commit, leaving the workspace in a detached state.
The subsequent run tries to do a 'git pull origin' and that can't
be done while the workspace is detached. I've changed the 'git
pull' to a 'git fetch --tags -f', which is then followed by 'git
checkout <requested change>'. That fixes that issue.
However, there is a lot of waste in the likely scenario that the
workspace is already checked out to the commit the script wants it
at. So I've added a check for that and we now no-op the git workspace
update in that case. That reduces a many-seconds phase of the script
to almost no time.
Co-authored-by: John Cortell <j.cortell@sarc.samsung.com>
print("Directory "+targetPath+" exists and is at expected commit. Nothing to do.")
105
+
sys.stdout.flush()
106
+
return
107
+
print("Directory "+targetPath+" exists but is not at the required commit. \n\tUsing 'git fetch' and 'git checkout' to move the workspace to "+reqdCommit[0:7])
0 commit comments