github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-05 11:36:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10992 from microsoft/danmihai1/git-helper

Browse Source 
gha: always delete workspace on rebase error
This commit is contained in:
Steve Horsman 2025-03-07 14:26:00 +00:00 committed by GitHub
commit 014ff8476a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/git-helper.sh
View File

@ -17,15 +17,11 @@ function add_kata_bot_info() {
}
function rebase_atop_of_the_latest_target_branch() {
if [ -n "${TARGET_BRANCH}" ]; then
if [[ -n "${TARGET_BRANCH}" ]]; then
echo "Rebasing atop of the latest ${TARGET_BRANCH}"
# Recover from any previous rebase left halfway
git rebase --abort 2> /dev/null || true
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"
if ! git rebase "origin/${TARGET_BRANCH}"; then
if [[ -n "${GITHUB_WORKSPACE}" ]] ; then
echo "Rebase failed, cleaning up the local repository and exiting"
cd "${GITHUB_WORKSPACE}"/..
sudo rm -rf "${GITHUB_WORKSPACE}"
else