<feed xmlns='http://www.w3.org/2005/Atom'>
<title>rneovim.git/.github/workflows/backport.yml, branch rahm</title>
<subtitle>Neovim fork with Rahm's personal hacks.
</subtitle>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/'/>
<entry>
<title>ci: skip automerge step if backport failed</title>
<updated>2024-09-13T23:55:36+00:00</updated>
<author>
<name>dundargoc</name>
<email>gocdundar@gmail.com</email>
</author>
<published>2024-09-13T14:50:08+00:00</published>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/commit/?id=67d6b6f27ed3016a2daf6037879d77becc2cfa8f'/>
<id>67d6b6f27ed3016a2daf6037879d77becc2cfa8f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>ci: add `needs:backport` label on backport PRs with conflict</title>
<updated>2024-09-13T14:49:35+00:00</updated>
<author>
<name>dundargoc</name>
<email>gocdundar@gmail.com</email>
</author>
<published>2024-09-13T13:27:57+00:00</published>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/commit/?id=4c23b834562f1d0587beef130c5e8ac434607358'/>
<id>4c23b834562f1d0587beef130c5e8ac434607358</id>
<content type='text'>
This makes it easy to keep track of which backport PRs have failed and
need manual intervention to fix.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This makes it easy to keep track of which backport PRs have failed and
need manual intervention to fix.
</pre>
</div>
</content>
</entry>
<entry>
<title>ci: enable automerge by default when backporting</title>
<updated>2024-09-13T10:31:33+00:00</updated>
<author>
<name>dundargoc</name>
<email>gocdundar@gmail.com</email>
</author>
<published>2024-09-10T22:55:38+00:00</published>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/commit/?id=057314345a7cfc8e52bbe13a595759d6ca52ac20'/>
<id>057314345a7cfc8e52bbe13a595759d6ca52ac20</id>
<content type='text'>
This will automatically merge backported PRs without human intervention
if the tests pass.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This will automatically merge backported PRs without human intervention
if the tests pass.
</pre>
</div>
</content>
</entry>
<entry>
<title>ci: always add `target:release` label when backporting</title>
<updated>2024-07-21T13:39:47+00:00</updated>
<author>
<name>dundargoc</name>
<email>gocdundar@gmail.com</email>
</author>
<published>2024-07-21T12:55:34+00:00</published>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/commit/?id=4c788b175743e54d0a73248c820d6cf16a854f6e'/>
<id>4c788b175743e54d0a73248c820d6cf16a854f6e</id>
<content type='text'>
Previously the label was not added if the backport PR was created
manually. The new code is also easier to maintain as it's close to other
label-related code.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Previously the label was not added if the backport PR was created
manually. The new code is also easier to maintain as it's close to other
label-related code.
</pre>
</div>
</content>
</entry>
<entry>
<title>ci: run workflows on release branches</title>
<updated>2024-07-16T12:15:50+00:00</updated>
<author>
<name>dundargoc</name>
<email>gocdundar@gmail.com</email>
</author>
<published>2024-07-16T10:51:53+00:00</published>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/commit/?id=a5d4e3467d4568e5ac804f8178dda054f5360b15'/>
<id>a5d4e3467d4568e5ac804f8178dda054f5360b15</id>
<content type='text'>
Github doesn't allow workflows to be run from the `github-actions`
account, which is the default account. This caused the CI on backport
PRs to not be run. The way to circumvent this is to use a token that
essentially "pretends" to be another user, which in turn triggers the CI
as desired.

Also run lintcommit on release branches as that is now a required check,
meaning it must always be run.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Github doesn't allow workflows to be run from the `github-actions`
account, which is the default account. This caused the CI on backport
PRs to not be run. The way to circumvent this is to use a token that
essentially "pretends" to be another user, which in turn triggers the CI
as desired.

Also run lintcommit on release branches as that is now a required check,
meaning it must always be run.
</pre>
</div>
</content>
</entry>
<entry>
<title>ci: bump backport action to version 3</title>
<updated>2024-05-27T17:47:49+00:00</updated>
<author>
<name>dundargoc</name>
<email>gocdundar@gmail.com</email>
</author>
<published>2024-05-27T16:42:45+00:00</published>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/commit/?id=f70af5c3cad098ee9c7f1956bc18991cbd515507'/>
<id>f70af5c3cad098ee9c7f1956bc18991cbd515507</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>ci: change label `backport` to `target:release`</title>
<updated>2024-05-17T20:46:20+00:00</updated>
<author>
<name>dundargoc</name>
<email>gocdundar@gmail.com</email>
</author>
<published>2024-05-17T20:35:46+00:00</published>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/commit/?id=512d228111bccf3e52613c798edc7f803c1de13f'/>
<id>512d228111bccf3e52613c798edc7f803c1de13f</id>
<content type='text'>
`backport` is too similar `ci:backport release-x.y` and causes
confusion.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
`backport` is too similar `ci:backport release-x.y` and causes
confusion.
</pre>
</div>
</content>
</entry>
<entry>
<title>ci: don't try to label backport PR if it was not created</title>
<updated>2024-05-02T09:45:07+00:00</updated>
<author>
<name>dundargoc</name>
<email>gocdundar@gmail.com</email>
</author>
<published>2024-05-01T22:58:07+00:00</published>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/commit/?id=d26943a6e185dea23077d41b4c81281e12be3997'/>
<id>d26943a6e185dea23077d41b4c81281e12be3997</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>ci: improve default backport pull request title</title>
<updated>2024-05-01T20:30:17+00:00</updated>
<author>
<name>dundargoc</name>
<email>gocdundar@gmail.com</email>
</author>
<published>2024-05-01T13:39:46+00:00</published>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/commit/?id=631d5189adaaf54eb48e0b136df3466880edb19c'/>
<id>631d5189adaaf54eb48e0b136df3466880edb19c</id>
<content type='text'>
`[Backport release-x.y]` will no longer be part of the pull request
title. This means the PR titles will go from looking like

```
[Backport release-0.9] fix(languagetree): remove double recursion in LanguageTree:parse
```

to

```
fix(languagetree): remove double recursion in LanguageTree:parse
```

The benefit of this is that pull requests merged with the "Squash and
Merge" strategy (which uses the PR title as the commit message), will
still follow the conventional commits specification. This will help
tools that rely on conventional commits such as git-cliff.

The `backport` label is added to backported PRs to help distinguish
between backport PRs with regular PRs in the "Pull Requests" tab on
github.

To reduce confusion with the `backport` label, the label to trigger the
backporting has been changed from `backport release-x.y` to
`ci:backport release-x.y`. This is also more consistent with other
labels that trigger a CI job which all use the `ci:` prefix.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
`[Backport release-x.y]` will no longer be part of the pull request
title. This means the PR titles will go from looking like

```
[Backport release-0.9] fix(languagetree): remove double recursion in LanguageTree:parse
```

to

```
fix(languagetree): remove double recursion in LanguageTree:parse
```

The benefit of this is that pull requests merged with the "Squash and
Merge" strategy (which uses the PR title as the commit message), will
still follow the conventional commits specification. This will help
tools that rely on conventional commits such as git-cliff.

The `backport` label is added to backported PRs to help distinguish
between backport PRs with regular PRs in the "Pull Requests" tab on
github.

To reduce confusion with the `backport` label, the label to trigger the
backporting has been changed from `backport release-x.y` to
`ci:backport release-x.y`. This is also more consistent with other
labels that trigger a CI job which all use the `ci:` prefix.
</pre>
</div>
</content>
</entry>
<entry>
<title>ci: write the correct cherry-picked commit id when backporting</title>
<updated>2024-01-01T14:17:56+00:00</updated>
<author>
<name>Jongwook Choi</name>
<email>wookayin@gmail.com</email>
</author>
<published>2024-01-01T13:35:35+00:00</published>
<link rel='alternate' type='text/html' href='https://git.josher.dev/cgit/rneovim.git/commit/?id=bcd111bd12b9d6db58a88fac728fc51af4d96c12'/>
<id>bcd111bd12b9d6db58a88fac728fc51af4d96c12</id>
<content type='text'>
Problem: Commits backport-merged to release branches are cherry-picked
from the original commits in the PR from a fork repository, NOT the
actual commit that are merged to neovim/neovim (HEAD). Therefore the
commit reference in the commit message `cherry picked from commit ...`
usually refers to a commit that does NOT exist in the repository,
given that our preferred way of merging PR (rebasing, squashing, etc.)
would rewrite commits.

Solution: Turn on new feature 'detect_merge_method' of backport-action
workflow.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Problem: Commits backport-merged to release branches are cherry-picked
from the original commits in the PR from a fork repository, NOT the
actual commit that are merged to neovim/neovim (HEAD). Therefore the
commit reference in the commit message `cherry picked from commit ...`
usually refers to a commit that does NOT exist in the repository,
given that our preferred way of merging PR (rebasing, squashing, etc.)
would rewrite commits.

Solution: Turn on new feature 'detect_merge_method' of backport-action
workflow.
</pre>
</div>
</content>
</entry>
</feed>
