Commit 57f4eba
Make pre-build.py re-runnable on Windows (#66)
* 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>1 parent 63f2ffc commit 57f4eba
1 file changed
Lines changed: 13 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
89 | 89 | | |
90 | 90 | | |
91 | 91 | | |
92 | | - | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
93 | 95 | | |
94 | | - | |
| 96 | + | |
95 | 97 | | |
96 | 98 | | |
97 | 99 | | |
98 | | - | |
99 | | - | |
100 | 100 | | |
101 | | - | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
102 | 110 | | |
103 | 111 | | |
104 | 112 | | |
| |||
0 commit comments