Skip to content

Commit e9f2d8b

Browse files
HirogenHirogen
authored
Merge branch 'Development' into toolservice
2 parents 46d5706 + f7f7ec7 commit e9f2d8b

2 files changed

Lines changed: 48 additions & 23 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
permissions:
99
contents: write
10+
pull-requests: write
1011

1112
jobs:
1213
release:
@@ -47,8 +48,10 @@ jobs:
4748
}
4849
Set-Content -Path "src/Solution Items/usedComponents.json" -Value $output -Encoding UTF8
4950
50-
- name: Commit generated files to Development
51+
- name: Open PR with generated files
5152
shell: pwsh
53+
env:
54+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5255
run: |
5356
git config user.name "github-actions[bot]"
5457
git config user.email "github-actions[bot]@users.noreply.github.com"
@@ -59,20 +62,42 @@ jobs:
5962
Copy-Item "src/Solution Items/usedComponents.json" $tempComponents
6063
Copy-Item "src/PluginRegistry/PluginHashGenerator.Generated.cs" $tempHashes
6164
62-
# Switch to Development and apply both updates
65+
# Development is PR-protected, so apply the updates on a fresh branch off Development
6366
git fetch origin Development
64-
git checkout Development
67+
$branch = "chore/generated-files-${{ github.ref_name }}"
68+
git checkout -B $branch origin/Development
69+
6570
Copy-Item $tempComponents "src/Solution Items/usedComponents.json"
6671
Copy-Item $tempHashes "src/PluginRegistry/PluginHashGenerator.Generated.cs"
6772
6873
git add "src/Solution Items/usedComponents.json"
6974
git add "src/PluginRegistry/PluginHashGenerator.Generated.cs"
75+
7076
git diff --staged --quiet
71-
if ($LASTEXITCODE -ne 0) {
72-
git commit -m "chore: update plugin hashes and usedComponents.json for ${{ github.ref_name }} [skip ci]"
73-
git push origin Development
77+
if ($LASTEXITCODE -eq 0) {
78+
Write-Host "No changes to commit; skipping PR."
79+
exit 0
80+
}
81+
82+
git commit -m "chore: update plugin hashes and usedComponents.json for ${{ github.ref_name }} [skip ci]"
83+
# Force-push so re-running the release for the same tag updates the existing branch
84+
git push --force origin $branch
85+
86+
# Create the PR if one does not already exist for this branch
87+
$existing = gh pr list --head $branch --base Development --state open --json number --jq '.[0].number'
88+
if ([string]::IsNullOrWhiteSpace($existing)) {
89+
gh pr create --base Development --head $branch `
90+
--title "chore: update generated files for ${{ github.ref_name }} [skip ci]" `
91+
--body "Automated update of plugin hashes and ``usedComponents.json`` for release ${{ github.ref_name }}."
7492
} else {
75-
Write-Host "No changes to commit"
93+
Write-Host "PR #$existing already exists for $branch"
94+
}
95+
96+
# Best-effort auto-merge. Will complete once branch rules are satisfied;
97+
# if the ruleset requires a manual review, merge the PR by hand.
98+
gh pr merge $branch --auto --squash --delete-branch 2>&1 | Write-Host
99+
if ($LASTEXITCODE -ne 0) {
100+
Write-Host "::warning::Could not enable auto-merge for $branch; merge the PR manually."
76101
}
77102
78103
- name: Create GitHub Release

‎src/PluginRegistry/PluginHashGenerator.Generated.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@ public static partial class PluginValidator
1010
{
1111
/// <summary>
1212
/// Gets pre-calculated SHA256 hashes for built-in plugins.
13-
/// Generated: 2026-06-08 20:19:32 UTC
13+
/// Generated: 2026-06-09 06:55:04 UTC
1414
/// Configuration: Release
1515
/// Plugin count: 21
1616
/// </summary>
1717
public static Dictionary<string, string> GetBuiltInPluginHashes()
1818
{
1919
return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
2020
{
21-
["AutoColumnizer.dll"] = "A46326FD9267FD6E71687D3D7A095000A59E35A1CCC50649701387D31B5CC795",
21+
["AutoColumnizer.dll"] = "3D6748C5E935505FFBFE24830208B11FAACF4EDCD672FBEABA4DD239B05D927A",
2222
["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
2323
["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
24-
["CsvColumnizer.dll"] = "43D9DAF673632633FA4CED2346C405CFA16163CEA04550932EFA2D18FBE4A108",
25-
["CsvColumnizer.dll (x86)"] = "43D9DAF673632633FA4CED2346C405CFA16163CEA04550932EFA2D18FBE4A108",
26-
["DefaultPlugins.dll"] = "116170FCD0CF481179099ED7D12D72FAF4969A5AC457EB3A5A6372D40776AEC7",
27-
["FlashIconHighlighter.dll"] = "2974A79822FB5FEE133D48CA265471DDC44321548785884EE9C482DFFCFE7F1F",
28-
["GlassfishColumnizer.dll"] = "6FBDDE6A01132AFD2D15642EFE3FD729950B779889749090E935544BAAF4942B",
29-
["JsonColumnizer.dll"] = "3CBCB28AB46CFAFA4CD193CCFB2A6A2C61B10A7C48AC5C9E116832D9CEFE7B2C",
30-
["JsonCompactColumnizer.dll"] = "6E8158EB64D48A7F8F3F7DD5C24BA84150849C6D846356E38BC82FD839696782",
31-
["Log4jXmlColumnizer.dll"] = "4046BD407C2A814C5EBAAE55AFA8A671D51DAB437B1AD9EAD931A15C1810E61C",
32-
["LogExpert.Resources.dll"] = "14FFCF4FFBC9EFD9EC6924D91B98FBB20F47DFAF414DACCF372E14561DABD2F3",
24+
["CsvColumnizer.dll"] = "D5435B1886C4FA665A59FB647CE488C092CD2BF0587BB219B3A623C656BA8BF6",
25+
["CsvColumnizer.dll (x86)"] = "D5435B1886C4FA665A59FB647CE488C092CD2BF0587BB219B3A623C656BA8BF6",
26+
["DefaultPlugins.dll"] = "675EACAA0B1700FC6163ED29058124553DF9D6E935020CF04B38DAA9F33C279C",
27+
["FlashIconHighlighter.dll"] = "47605D179B3646F81BF44E8626251CDD30752C0535293AF4C4AA89A1CAF76B06",
28+
["GlassfishColumnizer.dll"] = "1C30B9D350C46B33A76C96C88DA4B9DCF2B1474BB1ACD92461878365F704A2EC",
29+
["JsonColumnizer.dll"] = "27F5ED050CEDBC1BD72250DD7C9FC330DB32825FE04FB9C899376BF45F347D92",
30+
["JsonCompactColumnizer.dll"] = "08F189DE85381709A10DD506DA2DC1F4D9885C68AD0A63799557166295CAD590",
31+
["Log4jXmlColumnizer.dll"] = "D21498D4B727AA8F2DAF59CD470AEEB11603FF64936E8AB11EDD92A1370BC681",
32+
["LogExpert.Resources.dll"] = "C8390BB994FACB178D34EC2023F8862F685489549F52726FD9E742B6497B7781",
3333
["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3434
["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3535
["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
3636
["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
37-
["RegexColumnizer.dll"] = "62E25802F88FC206E8F202B6EE92661F9CC8AEAA081549821E151DD8BB271A86",
38-
["SftpFileSystem.dll"] = "B005BE7571EF4FA28D6223D792D5CEA9B586E2DC83A5AFD33455345F30BEF1B5",
39-
["SftpFileSystem.dll (x86)"] = "15282AD1EF2EF8A648F4597699900F87D84D3FFBD1A72E6685AF68CD604113A8",
40-
["SftpFileSystem.Resources.dll"] = "869762F9B842D69EF05AC6FEFE60201AC8A4B44D62BD64F42882CB17A071E0EB",
41-
["SftpFileSystem.Resources.dll (x86)"] = "869762F9B842D69EF05AC6FEFE60201AC8A4B44D62BD64F42882CB17A071E0EB",
37+
["RegexColumnizer.dll"] = "76A856BE58511F40B5E89D7F100AA7843AC62CD380717F924CCFDC234375BDAD",
38+
["SftpFileSystem.dll"] = "73D71AF4831468722C327DE246879343B9F95E4BA931B07F03A4B60C70B4A2A2",
39+
["SftpFileSystem.dll (x86)"] = "107BD9DF13EB1C0FB7F8B4C1B0D77B79A62A804FEA5F656FFADEBCDE3FFD4E5B",
40+
["SftpFileSystem.Resources.dll"] = "12539CBB43138C4D1AF4FFFC0D2D6370B6969E358DF9A03FD29720CA18D34287",
41+
["SftpFileSystem.Resources.dll (x86)"] = "12539CBB43138C4D1AF4FFFC0D2D6370B6969E358DF9A03FD29720CA18D34287",
4242

4343
};
4444
}

0 commit comments

Comments
 (0)