github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-23 14:08:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8601 from BbolroC/conflict-handling-for-self-hosted-runners

Browse Source 
GHA: remove GITHUB_WORKSPACE when workflow fails due to merge conflict
This commit is contained in:
Hyounggyu Choi 2023-12-07 12:17:31 +01:00 committed by GitHub
commit ad6aab9918
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/git-helper.sh
View File

@ -21,7 +21,18 @@ function rebase_atop_of_the_latest_target_branch() {
echo "Rebasing atop of the latest ${TARGET_BRANCH}" echo "Rebasing atop of the latest ${TARGET_BRANCH}"
# Recover from any previous rebase left halfway # Recover from any previous rebase left halfway
git rebase --abort 2> /dev/null || true git rebase --abort 2> /dev/null || true
git rebase origin/${TARGET_BRANCH} if ! git rebase origin/${TARGET_BRANCH}; then
# if GITHUB_WORKSPACE is defined and an architecture is not equal to x86_64
# (mostly self-hosted runners), then remove the repository
if [ -n "${GITHUB_WORKSPACE}" ] && [ "$(uname -m)" != "x86_64" ]; then
echo "Rebase failed, cleaning up a repository for self-hosted runners and exiting"
cd "${GITHUB_WORKSPACE}"/..
sudo rm -rf "${GITHUB_WORKSPACE}"
else
echo "Rebase failed, exiting"
fi
exit 1
fi
fi fi
} }