mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-06 01:41:35 +01:00
.github: Specify remote when checking out c-o/p-s ref in workflow
When the specified remote contains a same-named branch as origin, the checkout fails with "fatal: 'X' matched multiple (Y) remote tracking branches". Add the remote name as prefix to make the reference unambiguous.
This commit is contained in:
parent
51f740a2a8
commit
71510fb117
4
.github/workflows/ci.yaml
vendored
4
.github/workflows/ci.yaml
vendored
@ -112,7 +112,7 @@ jobs:
|
||||
[[ "$REMOTE" == "https:*" ]] || REMOTE="https://github.com/${COREOS_REMOTE}"
|
||||
git -C "$REPO_PATH" remote add test "$REMOTE"
|
||||
git -C "$REPO_PATH" fetch test
|
||||
git -C "$REPO_PATH" checkout "${COREOS_REF}"
|
||||
git -C "$REPO_PATH" checkout "test/${COREOS_REF}"
|
||||
fi
|
||||
|
||||
if [ "${PORTAGE_REMOTE}" != "" -a "${PORTAGE_REF}" != "" ]
|
||||
@ -122,7 +122,7 @@ jobs:
|
||||
[[ "$REMOTE" == "https:*" ]] || REMOTE="https://github.com/${PORTAGE_REMOTE}"
|
||||
git -C "$REPO_PATH" remote add test "$REMOTE"
|
||||
git -C "$REPO_PATH" fetch test
|
||||
git -C "$REPO_PATH" checkout "${PORTAGE_REF}"
|
||||
git -C "$REPO_PATH" checkout "test/${PORTAGE_REF}"
|
||||
fi
|
||||
|
||||
- name: Build packages
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user