particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

schutzbot/update_github_status: fix release fast-forwarding

Browse source 
The checkout in the working directory is a shallow clone with gitlab as
a remote. As a result fast-forwarding failed due to not recognizing the
remote release branch as an ancestor of $CI_COMMIT_SHA.

This clones (with `--bare`) the github remote in a separate
directory. It should not be necessary to remove the release-ff-clone
directory each time, simply fetch if it already exists.
This commit is contained in:
Sanne Raymaekers 2022-10-19 12:20:17 +02:00
parent d1e69fe528
commit 423b4b77d7
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
schutzbot/update_github_status.sh
View file

@ -42,7 +42,10 @@ curl \
# ff release branch on github if this ran on main
if [ "$CI_COMMIT_BRANCH" = "main" ] && [ "$GITHUB_NEW_STATE" = "success" ]; then
git remote add github "https://${SCHUTZBOT_LOGIN#*:}@github.com/osbuild/osbuild-composer.git"
if [ ! -d "release-ff-clone" ]; then
git clone --bare "https://${SCHUTZBOT_LOGIN#*:}@github.com/osbuild/osbuild-composer.git" release-ff-clone
fi
git -C release-ff-clone fetch origin
# || true to ignore non fast-forwards
git push github "${CI_COMMIT_SHA}:refs/heads/release" || true
git -C release-ff-clone push origin "${CI_COMMIT_SHA}:refs/heads/release" || true
fi