Skip to content

Commit

Permalink
chore: patch for rocks.nvim
Browse files Browse the repository at this point in the history
  • Loading branch information
mrcjkb committed Jul 24, 2024
1 parent 1644464 commit 9d09afd
Show file tree
Hide file tree
Showing 9 changed files with 709 additions and 32 deletions.
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake .# -Lv
29 changes: 29 additions & 0 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: Rebase on upstream
on:
workflow_dispatch:
schedule:
# Runs 30 min past every 12 h
- cron: "30 */12 * * *"
jobs:
rebase:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Rebase on upstream
run: |
git config --global user.name 'Marc Jakobi'
git config --global user.email '[email protected]'
# "git checkout master" is unnecessary, already here by default
git pull --unshallow # this option is very important, you would get
# complains about unrelated histories without it.
# (but actions/checkout can also be instructed
# to fetch all git depth right from the start)
git remote add upstream https://github.com/nvim-treesitter/nvim-treesitter.git
git fetch upstream
git checkout master
git rebase upstream/master
git push origin master
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ nvim.appimage
nvim-linux64*
nvim-macos*
nvim-win64*
.luarc.json
25 changes: 0 additions & 25 deletions .luarc.json

This file was deleted.

Loading

0 comments on commit 9d09afd

Please sign in to comment.