netsec-ethz / scionlab

SCIONLab user interface and administration
https://www.scionlab.org
Apache License 2.0
9 stars 15 forks source link

checkout master tracking it CI upgrade test #422

Closed juagargi closed 2 years ago

juagargi commented 2 years ago

CI runs the upgrade test by building master. To do so, it runs

git checkout master
git pull --ff-only  # may be stale

But it could happen that master was already checked out in .git and recover by the cache, and thus the branch will be local only (or whatever the cache had) and git pull will fail.

Instead run

git checkout --force -B master --track origin/master

This change is Reviewable