Add autopush workflow, fix incorrect master branch name

uf-mil · Aug 25, 2024 · ad20461 · ad20461
1 parent 27ce912
commit ad20461
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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