From 3047a909a2cdd023713e30e0628415e08afb66e1 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 26 Apr 2021 23:29:10 -0400
Subject: [PATCH 1/3] ci(gha/nightly): Enable "contents: write" permissions to
 setup PR

[skip ci]
---
 .github/workflows/nightly.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 431ccd8b61..5823d8187e 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -6,6 +6,9 @@ on:
 jobs:
   update-vim-patches:
     runs-on: ubuntu-20.04
+    permissions:
+      contents: write
+      pull-requests: write
     env:
       VIM_SOURCE_DIR: ${{ format('{0}/vim-src', github.workspace) }}
       VERSION_BRANCH: marvim/ci-version-update

From 2601296c3f871cc49d10b2d96ce0bf7a9de4ee1b Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 26 Apr 2021 23:38:36 -0400
Subject: [PATCH 2/3] ci(gha): Rename nightly workflow to vim-patches

[skip ci]
---
 .github/workflows/{nightly.yaml => vim-patches.yml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename .github/workflows/{nightly.yaml => vim-patches.yml} (98%)

diff --git a/.github/workflows/nightly.yaml b/.github/workflows/vim-patches.yml
similarity index 98%
rename from .github/workflows/nightly.yaml
rename to .github/workflows/vim-patches.yml
index 5823d8187e..38e19d5e25 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/vim-patches.yml
@@ -1,4 +1,4 @@
-name: Nightly
+name: vim-patches
 on:
   schedule:
     - cron: '3 3 * * *'

From 0ab1f9ff3fb2036e9ef51672193620aff704884e Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 26 Apr 2021 23:41:25 -0400
Subject: [PATCH 3/3] ci(gha/vim-patches): Create PR against branch running the
 workflow

Avoids hard-coding branch names.

[skip ci]
---
 .github/workflows/vim-patches.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/vim-patches.yml b/.github/workflows/vim-patches.yml
index 38e19d5e25..5742b51158 100644
--- a/.github/workflows/vim-patches.yml
+++ b/.github/workflows/vim-patches.yml
@@ -49,4 +49,4 @@ jobs:
           git add -u
           git commit -m 'version.c: update [skip ci]'
           git push --force https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY} ${VERSION_BRANCH}
-          gh pr create --fill --label vim-patch --base master --head ${VERSION_BRANCH} || true
+          gh pr create --fill --label vim-patch --base ${GITHUB_REF#refs/heads/} --head ${VERSION_BRANCH} || true