mirror of
https://github.com/kellymichels/zscripts-token-savers
synced 2026-10-06 07:08:17 +00:00
Kelly Michels
732a448be5
* feat: add zmerge and zpull
Two commands that were private-only until now. They turned out to be useful
beyond the fleet they were written for, so they are manifested for publication
and removed from the sanitization denylist's private-only list.
zmerge merge every pull request across the org that is genuinely ready -
MERGEABLE/CLEAN and not a draft - re-checking each one immediately
before and after every merge, because merging into a default branch
can conflict a sibling PR in the same repository. Dry run by
default; -Execute or -e merges.
zpull zmerge, then git pull --ff-only in every checkout the merges
affected. Skips a checkout that is dirty or is not on its default
branch rather than guessing at it.
WHY THEY COULD BE PUBLISHED NOW. zmerge carried a hardcoded list of sixteen
repository names, which was both the reason it could not be published and a
bug: the org has thirty active repositories, so it scanned about half and
reported "Nothing open to merge" while a ready pull request sat in one it had
never heard of. It asks GitHub now, and the names went with the list.
Get-FleetRepos throws rather than returning an empty list when gh fails,
because a tool that quietly scans nothing prints the same reassuring line as
one that scanned everything and found nothing.
-e is an alias for -Execute on both, the way -s already works for -Scan.
Also: __pycache__/ is gitignored. scripts/plaintext_twins.py creates it on
every run and it was showing up as untracked work.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* fix: CRLF the new scripts, as .gitattributes pins them
zmerge.ps1, zpull.ps1 and zpull.cmd went in with LF endings. .gitattributes
pins *.ps1 and *.cmd to eol=crlf precisely so CHECKSUMS.txt can hold one hash
per file rather than one per platform - so git handed CI a CRLF checkout while
the manifest carried hashes taken from my LF copies, and the three new files
were the only ones that failed.
Local verification passed and CI did not, which is the tell: the manifest was
generated against bytes that only existed on this machine.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
46 lines
3.5 KiB
Plaintext
46 lines
3.5 KiB
Plaintext
9b3e7daf69a8295679b79072ea3e044c28f29b3ebeacdffe72c4878aaae34b08 setup_backup_schedule.ps1
|
|
196364f1ff68608e4f7427f6b4e9e91811361eaad8d520db85075136bbe6e506 token-count.ps1
|
|
4037dd7fb40f91b9f7be380a771d0bdaac51e4a262e1120d38e4f53d4974e942 zbackup.cmd
|
|
85fd3b754a069302dc08e33101fae3beb96cd16bc505eedc1f44c1af7bdf7636 zbackup.ps1
|
|
06cde8cd7332a42f25c11666e759ab8002690c00261df9cd7010a5f29e26edda zbackup_and_sync.ps1
|
|
29bd3b062a8f02c51eb6abfa50e506e304d85ddffe1f870e2ba3ff11fda6077d zbackup_ec2.cmd
|
|
5833f9c685581879f669a9e19d6c791d876fc91a316c89a8d60fda77dd35de75 zbackup_ec2.ps1
|
|
f1fb8fb35ec468cf9c084e28f77398b59479daab06fe96909c6c2e7e8ea1a561 zchecksums.cmd
|
|
7f967d89feeeaf4ca1fbea93a3d013a1a7b0141e11ec6f2888b6d4ac0bdb3485 zchecksums.ps1
|
|
6126973cbc0ccb22785340354afb9a1495f3d9798f60d3e6fc1c3d3a92285d67 zdeploy.cmd
|
|
d14f1d1f51b4a82c8166d81ae87f7a13663a2b0386c8c1c94ec556caa9ce62bb zdeploy.ps1
|
|
1c2c99cbb986fa8993d47404eaba89ae05b854b6396a541783b46ee22ba359e9 zec2.cmd
|
|
6b427881c670e2c1ba2ce95bee1ee446be770da85cde1fd91c36cbf40c39cff0 zec2.ps1
|
|
0e4e9cbd19fdd151bdc07df8d72aee577e446e2280dbc7afa0039d503364e991 zec2_rotatekeys.cmd
|
|
25068fa51dddd221c0b05628d78c7fa14f1d8c853c6c3f94ec760430122a1589 zec2_rotatekeys.ps1
|
|
408d43e37a6febf3543dd74f449b00d6cdb4cfa6d5ae6ab48b6b840bbfd63ecb zec2online.cmd
|
|
f1c3a0f911da86e018f9b3d4d7c9be048210aa56c016548570edfbab79fed8ef zec2online.ps1
|
|
e904b06017619f0ea13a79c34f56c70e642a5f0aae7dfab55159885aac2ac384 ZHelpers.ps1
|
|
1e1dcdc76250d57b2b393a650fa853452f4cb271b58a05a7dc8c01f436958424 zkill.cmd
|
|
1eb4c23bdc0ed1a82dc495c623b49e5dcd4e342f026b4d896e32c79d592667db zkill.ps1
|
|
1c908b69fb9200610e080ac6bb8f4c15d3d7edf402d2e119c2405158e1986a52 ZKiller.ps1
|
|
558dfdfc7b4d12231e476c14a00c678e2e536140c4b7abbc05364bf214562291 ZKillOnly.ps1
|
|
b42899ffd20c0b287af0072199d52a945b82123c86b9969cbf68b78b9f81f3d5 zmerge.ps1
|
|
b8f89795ccb1f31e9a4feb8abdaa04e764f361b2d2db5e3e13d9ca839afdbf75 zpull.cmd
|
|
628d26a64a4765667627db199fee7a0ca80aadebd3299350fa742e66bcd83580 zpull.ps1
|
|
36b01f2cd1d5967dc3ec1313fc4f82ada2ea669d0529a0d313300e21a5b38d04 zrelease.cmd
|
|
e48b994605b1ad9f793f95d653f50df41db628a6b2c6976415b7d03e3900a373 zrelease.ps1
|
|
02635351847f84d0f644ffa9c0073804e480d360fcabcd6a8b793cffd6f0026f zrepair.cmd
|
|
ffb544517ca8613ea2babc61dad19352a06840b1cb8c692e3f4b890f1e214297 zrepair.ps1
|
|
d2d80e9f063284cb4c4a0605e5e4aa4636f1d2bdb8bce2bd038961ae95515501 zrestart.cmd
|
|
2107fdd0e25ed6694eb992e706590da0f6fb0461e9cef300df5ca8ae568d27b3 zrestart.ps1
|
|
5b5a54a82c126552624af4a35b3f0da222b64e614b639877950dbd4d12cfb64f zrestartd.cmd
|
|
00eb0665d23d700170267b23be494c63f0ffaea420813e153aabfe49e5594d0f zsetup.cmd
|
|
ed73481327cb3fbf2a2eff85fbe1dc723c4f26a2f6b9e54c16719be6ce96fd8f zsetup.ps1
|
|
46695f5009dee0dd425fccc3993c6c368882257bc03e91111f69ee8a6250e342 zsetup_mail.ps1
|
|
98ac29e9d767d5173de828fba46bb0d82bc57999f2da83eec50079c934d44119 zstart.cmd
|
|
70381eacf132ac3af60655e72fd6e40db2c3be2c5978ef451207b4597191f712 zstart.ps1
|
|
d7ef72318b6764e2948272deae539a65904c6b5e06ef5c2aaf0e435da3d025d2 zstart_docker.cmd
|
|
293f2d9a77c3657f7a40f4a03ddbc723adf5871b3b6a1c614911cf0222984069 zstart_docker.ps1
|
|
f37fcf3b49f7af8a39507293c4f96fdbc3cc460318acae9fdae13b4ac89688e0 zstartd.cmd
|
|
50537f209f3152f5a9afef6c28ad1b3bac37bca70bc5ee5c7b54236ed7acb01b zstop.ps1
|
|
d51df3f48a18c7e2225e1a24b5db8c984eee196d58038e015ac915e1e2384d33 zsync.cmd
|
|
fee5782dc503ba3bbd3a987698277ba467bbdce5ea0527f8f42fb396e3ef3db7 zsync.ps1
|
|
2056ffca049697a186015eec3da2b6634153482e294659fa550c6e9d693395a3 zversion.cmd
|
|
6656725cee68f9082a0932e15c24a08eddc24247e387a9f8ae5dd24413836188 zversion.ps1
|