mirror of
https://github.com/nix-community/nix-doom-emacs
synced 2025-08-09 12:57:26 -05:00
.github: try hard-resetting too just incase
This commit is contained in:
3
.github/workflows/test_dep_update.sh
vendored
3
.github/workflows/test_dep_update.sh
vendored
@ -5,8 +5,9 @@ echo "$GITHUB_API_TOKEN" | gh auth login --with-token
|
|||||||
git branch -D depupdate || true
|
git branch -D depupdate || true
|
||||||
git branch depupdate
|
git branch depupdate
|
||||||
git checkout depupdate
|
git checkout depupdate
|
||||||
|
git reset --hard origin/master
|
||||||
json="$(gh pr list --search "author:app/github-actions" --json headRefName,number)"
|
json="$(gh pr list --search "author:app/github-actions" --json headRefName,number)"
|
||||||
echo "$json" | jq '.[] | .headRefName | @text' | xargs -L1 -- git pull --rebase origin
|
echo "$json" | jq '.[] | .headRefName | @text' | xargs -L1 -- git pull origin
|
||||||
if nix flake check; then
|
if nix flake check; then
|
||||||
echo "$json" | jq ".[] | .number | @text" | xargs -L1 -- gh pr merge --squash --delete-branch
|
echo "$json" | jq ".[] | .number | @text" | xargs -L1 -- gh pr merge --squash --delete-branch
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user