Skip to content

Commit

Permalink
Oof
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmlr committed Sep 4, 2024
1 parent 5d36efc commit f6e9806
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion lib/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ merge_into_remote() { # Merge our workflow into the remote repository. Makes wor
git commit -m "ci: Import from actions-sync, check carefully"
fi
fi
git branch actions-sync-update
git checkout -b actions-sync-update
git push -u origin HEAD -f

# Create PR if ahead of the import branch
Expand Down
1 change: 0 additions & 1 deletion template/.github/workflows/push-on-change.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
echo "slug=$(echo $GITHUB_REF | sed 's#refs/heads/##')" >> $GITHUB_OUTPUT
shell: bash


- name: Merge subtree
env:
TOKEN_KEYS: ${{ secrets.TOKEN_KEYS }}
Expand Down

0 comments on commit f6e9806

Please sign in to comment.