mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci/update: fix how 're-apply' finds the 'base' commit

Browse source 
We need to look for a commit authored by `nixvim-ci[bot]`,
not `github-actions[bot]`.
This commit is contained in:
Matt Sturgeon 2025-06-02 11:21:24 +01:00
parent 2d60548ab1
commit 80934be3e9
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/update.yml vendored
View file

@ -57,11 +57,13 @@ jobs:
slug: ${{ steps.app-token.outputs.app-slug }} slug: ${{ steps.app-token.outputs.app-slug }}
run: | run: |
name="$slug[bot]" name="$slug[bot]"
name_regex="$slug"'\[bot\]'
id=$(gh api "/users/$name" --jq .id) id=$(gh api "/users/$name" --jq .id)
{ {
echo "id=$id" echo "id=$id"
echo "name=$name" echo "name=$name"
echo "email=$id+$name@users.noreply.github.com" echo "email=$id+$name@users.noreply.github.com"
echo 'author-regex=^'"$name_regex"' <'"$id+$name_regex"'@users\.noreply\.github\.com>$'
} >> "$GITHUB_OUTPUT" } >> "$GITHUB_OUTPUT"
- name: Configure git - name: Configure git
@ -159,13 +161,14 @@ jobs:
- name: Apply commits from the open PR - name: Apply commits from the open PR
id: re_apply id: re_apply
if: (inputs.re_apply || github.event_name == 'schedule') && steps.open_pr_info.outputs.number if: (inputs.re_apply || github.event_name == 'schedule') && steps.open_pr_info.outputs.number
env:
author_regex: ${{ steps.user-info.outputs.author-regex }}
run: | run: |
# The base is the most recent commit on the remote branch by github-actions[bot] # The base is the most recent commit on the remote branch authored by nixvim-ci
# This should be a flake.lock bump or a generated-files update # This should be a flake.lock bump or a generated-files update
# We will cherry-pick all commits on the remote _after_ the $base commit # We will cherry-pick all commits on the remote _after_ the $base commit
remote="origin/$pr_branch" remote="origin/$pr_branch"
author_rxp='^github-actions\[bot\] <41898282+github-actions\[bot\]@users\.noreply\.github\.com>$' base=$(git rev-list --author="$author_regex" --max-count=1 "$remote")
base=$(git rev-list --author="$author_rxp" --max-count=1 "$remote")
commits=( $(git rev-list --reverse "$base..$remote") ) commits=( $(git rev-list --reverse "$base..$remote") )
if [[ -n "$commits" ]]; then if [[ -n "$commits" ]]; then
echo "Applying ${#commits[@]} commits..." echo "Applying ${#commits[@]} commits..."