diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-23 21:17:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 21:17:45 +0100 |
| commit | 2427ba619c3b0955de990fe5043a8a77ba372fc0 (patch) | |
| tree | 1eb33d2a7d01d576d537b8bba27e2fe4b3bf5178 /maintainers | |
| parent | 81ad5154a2da010d26e13e7eb2755a16ae1a353c (diff) | |
| parent | 00ee56846b20c3d826ff659eaf4150d4484f9410 (diff) | |
Merge pull request #161260 from jtojnar/gnome-update-bump
gnome.updateScript: Various improvements
Diffstat (limited to 'maintainers')
| -rwxr-xr-x | maintainers/scripts/update.nix | 2 | ||||
| -rw-r--r-- | maintainers/scripts/update.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index d881d68301bad..1a2f06c73a2c5 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -147,7 +147,7 @@ let to run update script for specific package, or - % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: builtins.isList pkg.updateScript && builtins.length pkg.updateScript >= 1 && (let script = builtins.head pkg.updateScript; in builtins.isAttrs script && script.name == "gnome-update-script"))' + % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: pkg.updateScript.name or null == "gnome-update-script")' to run update script for all packages matching given predicate, or diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index 06b12a0ee04ec..07e0b5c68305c 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -88,6 +88,10 @@ async def commit_changes(name: str, merge_lock: asyncio.Lock, worktree: str, bra async with merge_lock: await check_subprocess('git', 'add', *change['files'], cwd=worktree) commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change) + if 'commitMessage' in change: + commit_message = change['commitMessage'] + elif 'commitBody' in change: + commit_message = commit_message + '\n\n' + change['commitBody'] await check_subprocess('git', 'commit', '--quiet', '-m', commit_message, cwd=worktree) await check_subprocess('git', 'cherry-pick', branch) |