-
Notifications
You must be signed in to change notification settings - Fork 197
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #58 from ashfinal/master
Add VertSplit border; Clear Folded background
- Loading branch information
Showing
2 changed files
with
32 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
name: Automatic merge from upstream | ||
|
||
on: | ||
schedule: | ||
# * is a special character in YAML so you have to quote this string | ||
- cron: '0 0 * * *' | ||
|
||
jobs: | ||
build: | ||
|
||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v1 | ||
- name: Sync upstream changes every day | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
GITHUB_ACTOR: ${{ github.actor }} | ||
GITHUB_REPO: ${{ github.repository }} | ||
run: | | ||
REMOTE_REPO="rakr/vim-one" | ||
git config user.email "[email protected]" | ||
git config user.name "GitHub Merge Action" | ||
git checkout master | ||
git remote set-url origin "https://$GITHUB_ACTOR:[email protected]/$GITHUB_REPO" | ||
git remote add upstream "https://github.com/$REMOTE_REPO" | ||
git fetch upstream | ||
git merge upstream/master | ||
git remote rm upstream | ||
git push origin HEAD:master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
187f5c8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems ashfinal's master branch is not clean. In this very branch, not only GH-1, GH-2 are merged, but also there's his custom github action. Suggest reverting this pr and
cherry-pick 5d91c4e
only.