diff --git a/.github/workflows/autopush.yaml b/.github/workflows/autopush.yaml index 442ddb8d2..5cdc36b9a 100644 --- a/.github/workflows/autopush.yaml +++ b/.github/workflows/autopush.yaml @@ -91,8 +91,8 @@ jobs: "$(git --no-pager log --format=format:'%an' -n 1)" git config --global user.email \ "$(git --no-pager log --format=format:'%ae' -n 1)" - git rebase origin/main || cat .github/workflows/autopush.yaml - git checkout main + git rebase origin/master + git checkout master git branch git merge --ff-only ${{ github.event.ref }} # git push diff --git a/scripts/setup.bash b/scripts/setup.bash index 898809842..0d2f65273 100755 --- a/scripts/setup.bash +++ b/scripts/setup.bash @@ -133,6 +133,10 @@ cm() { fi } +autopush() { + git push origin +"${1:-HEAD}":refs/heads/cameron-autopush-"$(uuidgen --random | cut -c1-8)"-citmp +} + alias xbox=startxbox # PYTHONPATH modifications