Skip to content

Commit 2898f6b

Browse files
try to fix: submodules checkout to fix conflicts
1 parent 70a2e46 commit 2898f6b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/ci-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
sed -i 's/--abort-on-container-exit/-d/' bin/first-build.sh
4949
TAB=$'\t'
5050
export FALLBACK_BRANCH=$([ "$GITHUB_BRANCH" == "master" ] && echo "main" && echo "master" || echo "develop")
51-
git submodule foreach bash -c 'git reset --hard && git clean -fd && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"'
51+
git submodule foreach bash -c 'git checkout . && git checkout "${GITHUB_BRANCH}" || git checkout develop || git checkout master || git checkout main || git checkout "${FALLBACK_BRANCH}"'
5252
git submodule foreach git rev-parse --abbrev-ref HEAD
5353
5454
- name: Run Script

0 commit comments

Comments
 (0)