You've already forked go-template-container-webserver
fixed update script, ignored cursor
Some checks failed
Update Child Repos / update (push) Failing after 10s
Some checks failed
Update Child Repos / update (push) Failing after 10s
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
LICENSE
|
||||
dockerfile
|
||||
makefile
|
||||
.makeVars
|
||||
.vars
|
||||
.cursor
|
||||
*.md
|
||||
*.sh
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +1,2 @@
|
||||
.cursor
|
||||
*.sql
|
||||
|
||||
@@ -38,7 +38,7 @@ if [ -z "${CLONE_URLS}" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
declare -a REPOS_WITH_CONFLICTS
|
||||
declare -a REPOS_WITH_CONFLICTS=()
|
||||
|
||||
while IFS= read -r clone_url; do
|
||||
if [ -z "${clone_url}" ]; then
|
||||
@@ -118,11 +118,13 @@ while IFS= read -r clone_url; do
|
||||
else
|
||||
echo "Warning: Merge conflicts detected in ${repo_name}"
|
||||
popd
|
||||
rm -rf "${repo_name}"
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
|
||||
popd
|
||||
rm -rf "${repo_name}"
|
||||
done <<< "${CLONE_URLS}"
|
||||
|
||||
if [ ${#REPOS_WITH_CONFLICTS[@]} -gt 0 ]; then
|
||||
|
||||
Reference in New Issue
Block a user