You've already forked go-template-container-webserver
Compare commits
2 Commits
8b5502d32d
...
09683e266c
| Author | SHA1 | Date | |
|---|---|---|---|
| 09683e266c | |||
| 5ffe714acb |
@@ -21,7 +21,7 @@ if [ "${PREVIOUS_COMMIT_ID}" = "${CURRENT_COMMIT_ID}" ]; then
|
||||
FILES_PERMISSION_CHANGED=""
|
||||
else
|
||||
FILES_CHANGED=$(git diff --name-only "${PREVIOUS_COMMIT_ID}" "${CURRENT_COMMIT_ID}" | tr '\n' ' ')
|
||||
FILES_PERMISSION_CHANGED=$(git diff --summary "${PREVIOUS_COMMIT_ID}" "${CURRENT_COMMIT_ID}" | grep "mode change" | sed -E 's/.*mode change [0-9]+ => [0-9]+ (.*)/\1/' | tr '\n' ' ')
|
||||
FILES_PERMISSION_CHANGED=$(git diff --summary "${PREVIOUS_COMMIT_ID}" "${CURRENT_COMMIT_ID}" | (grep "mode change" || true) | sed -E 's/.*mode change [0-9]+ => [0-9]+ (.*)/\1/' | tr '\n' ' ')
|
||||
fi
|
||||
|
||||
is_file_changed() {
|
||||
@@ -30,7 +30,6 @@ is_file_changed() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Check if file was changed (content or permissions)
|
||||
for changed_file in ${FILES_CHANGED}; do
|
||||
if [ "${changed_file}" = "${file_to_check}" ]; then
|
||||
return 0
|
||||
@@ -83,13 +82,13 @@ while IFS= read -r clone_url; do
|
||||
|
||||
repo_name=$(basename "${clone_url}" .git)
|
||||
|
||||
git clone "${clone_url}" "${repo_name}"
|
||||
pushd "${repo_name}"
|
||||
git clone "${clone_url}" "${repo_name}" &>/dev/null
|
||||
pushd "${repo_name}" >/dev/null
|
||||
|
||||
TEMPLATE_REMOTE_NAME="template"
|
||||
git remote add "${TEMPLATE_REMOTE_NAME}" "${TEMPLATE_REPO_DIR}"
|
||||
|
||||
git fetch "${TEMPLATE_REMOTE_NAME}" "${TEMPLATE_BRANCH}"
|
||||
git fetch "${TEMPLATE_REMOTE_NAME}" "${TEMPLATE_BRANCH}" &>/dev/null
|
||||
|
||||
current_branch=$(git rev-parse --abbrev-ref HEAD)
|
||||
|
||||
@@ -178,13 +177,13 @@ while IFS= read -r clone_url; do
|
||||
git push
|
||||
else
|
||||
echo "Warning: Merge conflicts detected in ${repo_name}"
|
||||
popd
|
||||
popd >/dev/null
|
||||
rm -rf "${repo_name}"
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
|
||||
popd
|
||||
popd >/dev/null
|
||||
rm -rf "${repo_name}"
|
||||
done <<< "${CLONE_URLS}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user