From ceac237d3c2698725eb744c7cc5f4babe2c17171 Mon Sep 17 00:00:00 2001 From: traxys Date: Mon, 11 Mar 2024 12:55:51 +0100 Subject: [PATCH] Add neovim related workflows --- .github/workflows/merge.yml | 24 ++++++++++++++++++++++++ .github/workflows/update.yaml | 15 ++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/merge.yml diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml new file mode 100644 index 0000000..85bb8f6 --- /dev/null +++ b/.github/workflows/merge.yml @@ -0,0 +1,24 @@ +name: automerge +on: + pull_request: + types: + - opened +jobs: + automerge: + runs-on: ubuntu-latest + steps: + - name: Wait for build to succeed + uses: fountainhead/action-wait-for-check@v1.1.0 + id: wait-for-build + with: + token: ${{ secrets.GITHUB_TOKEN }} + checkName: tests + ref: ${{ github.event.pull_request.head.sha || github.sha }} + intervalSeconds: 60 + timeoutSeconds: 1200 + - id: automerge + name: automerge + uses: "pascalgn/automerge-action@v0.15.6" + env: + MERGE_METHOD: rebase + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index fa26b00..4b414f1 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -10,6 +10,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 + with: + token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} - name: Install Nix uses: cachix/install-nix-action@v20 with: @@ -20,8 +22,15 @@ jobs: uses: DeterminateSystems/update-flake-lock@v16 with: pr-title: "Update flake.lock" - - uses: juliangruber/merge-pull-request-action@v1 + token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} + - uses: actions-ecosystem/action-add-labels@v1 with: - github-token: ${{ secrets.GITHUB_TOKEN }} + labels: automerge number: ${{ steps.update.outputs.pull-request-number }} - method: rebase + - name: Update nvim-treesitter + run: | + git checkout update_flake_lock_action + nix run .\#update-nvim-treesitter -- neovim/nvim-treesitter + git add neovim/nvim-treesitter + git commit -m "neovim: Update nvim-treesitter parsers" + git push