mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-21 03:25:56 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a895909b8b |
No files matched your search
+18
-4
@@ -42,7 +42,7 @@ def published(repo, component):
|
|||||||
|
|
||||||
|
|
||||||
def fragment_note(text, areas):
|
def fragment_note(text, areas):
|
||||||
sections = text.strip().split('---', 2)
|
sections = text.lstrip('\ufeff').strip().split('---', 2)
|
||||||
if len(sections) != 3 or sections[0]:
|
if len(sections) != 3 or sections[0]:
|
||||||
raise ValueError('Invalid release fragment')
|
raise ValueError('Invalid release fragment')
|
||||||
fields = dict(line.split(':', 1) for line in sections[1].splitlines() if ':' in line)
|
fields = dict(line.split(':', 1) for line in sections[1].splitlines() if ':' in line)
|
||||||
@@ -58,12 +58,12 @@ def fragment_note(text, areas):
|
|||||||
return title
|
return title
|
||||||
|
|
||||||
|
|
||||||
def remote_fragments(repo, sha, seen, areas):
|
def remote_fragments(repo, sha, seen, areas, excluded_blobs=()):
|
||||||
if not re.fullmatch(r'[0-9a-f]{40}', sha):
|
if not re.fullmatch(r'[0-9a-f]{40}', sha):
|
||||||
raise ValueError('Changelog collection requires an immutable source SHA')
|
raise ValueError('Changelog collection requires an immutable source SHA')
|
||||||
listing = api(f'repos/{repo}/contents/changelog.d?ref={sha}')
|
listing = api(f'repos/{repo}/contents/changelog.d?ref={sha}')
|
||||||
files = [f for f in listing if re.fullmatch(r'\d{8}-[a-z0-9-]+\.md', f['name'])]
|
files = [f for f in listing if re.fullmatch(r'\d{8}-[a-z0-9-]+\.md', f['name'])]
|
||||||
new = [f for f in files if repo + ':' + f['name'] not in seen]
|
new = [f for f in files if repo + ':' + f['name'] not in seen and f['sha'] not in excluded_blobs]
|
||||||
|
|
||||||
def read(item):
|
def read(item):
|
||||||
blob = api(f'repos/{repo}/git/blobs/{item["sha"]}')
|
blob = api(f'repos/{repo}/git/blobs/{item["sha"]}')
|
||||||
@@ -89,18 +89,32 @@ def collect_manager(root, tag, seen):
|
|||||||
return notes, [repo + ':' + Path(p).name for p in paths], {'commit': sha}
|
return notes, [repo + ':' + Path(p).name for p in paths], {'commit': sha}
|
||||||
|
|
||||||
|
|
||||||
|
def upstream_fragment_blobs(lock):
|
||||||
|
upstream = lock['components'].get('upstream')
|
||||||
|
if not upstream:
|
||||||
|
return set()
|
||||||
|
prefix = 'repos/' + upstream['repository'] + '/git/trees/'
|
||||||
|
tree = api(prefix + upstream['sha'])['tree']
|
||||||
|
directory = next((item for item in tree if item['path'] == 'changelog.d' and item['type'] == 'tree'), None)
|
||||||
|
if not directory:
|
||||||
|
return set()
|
||||||
|
files = api(prefix + directory['sha'])['tree']
|
||||||
|
return {item['sha'] for item in files if item['type'] == 'blob' and re.fullmatch(r'\d{8}-[a-z0-9-]+\.md', item['path'])}
|
||||||
|
|
||||||
|
|
||||||
def collect_server(repo, tag, seen, previous):
|
def collect_server(repo, tag, seen, previous):
|
||||||
with tempfile.TemporaryDirectory() as folder:
|
with tempfile.TemporaryDirectory() as folder:
|
||||||
subprocess.run(['gh', 'release', 'download', tag, '--repo', repo, '--pattern', 'release-lock.json', '--dir', folder], check=True)
|
subprocess.run(['gh', 'release', 'download', tag, '--repo', repo, '--pattern', 'release-lock.json', '--dir', folder], check=True)
|
||||||
lock = json.loads((Path(folder) / 'release-lock.json').read_text(encoding='utf-8-sig'))
|
lock = json.loads((Path(folder) / 'release-lock.json').read_text(encoding='utf-8-sig'))
|
||||||
notes, ids = [], []
|
notes, ids = [], []
|
||||||
|
imported_blobs = upstream_fragment_blobs(lock)
|
||||||
for role in ('core', 'bots', 'scaling', 'build'):
|
for role in ('core', 'bots', 'scaling', 'build'):
|
||||||
item = lock['components'].get(role)
|
item = lock['components'].get(role)
|
||||||
if not item:
|
if not item:
|
||||||
raise ValueError('Release lock has no ' + role + ' source')
|
raise ValueError('Release lock has no ' + role + ' source')
|
||||||
if item['repository'] == 'Corfirean/coa-server-manager':
|
if item['repository'] == 'Corfirean/coa-server-manager':
|
||||||
raise ValueError('A Manager source cannot supply server release notes')
|
raise ValueError('A Manager source cannot supply server release notes')
|
||||||
entries, found = remote_fragments(item['repository'], item['sha'], seen, SERVER_AREAS)
|
entries, found = remote_fragments(item['repository'], item['sha'], seen, SERVER_AREAS, imported_blobs if role == 'core' else ())
|
||||||
notes.extend(entries)
|
notes.extend(entries)
|
||||||
ids.extend(found)
|
ids.extend(found)
|
||||||
old = previous.get('components', {})
|
old = previous.get('components', {})
|
||||||
|
|||||||
@@ -71,6 +71,28 @@ class ComponentHistoryTests(unittest.TestCase):
|
|||||||
seen = {'Corfirean/coa-server-manager:20261021-own.md'}
|
seen = {'Corfirean/coa-server-manager:20261021-own.md'}
|
||||||
self.assertEqual(sync.collect_manager(root, 'v0.7.0', seen)[0], [])
|
self.assertEqual(sync.collect_manager(root, 'v0.7.0', seen)[0], [])
|
||||||
|
|
||||||
|
def test_utf8_bom_does_not_break_a_valid_historical_fragment(self):
|
||||||
|
text = '\ufeff---\narea: bots\ntitle: Companions keep their combat form\n---\n'
|
||||||
|
self.assertEqual(sync.fragment_note(text, sync.SERVER_AREAS), 'Companions keep their combat form')
|
||||||
|
|
||||||
|
def test_imported_upstream_fragments_are_not_credited_as_our_changes(self):
|
||||||
|
import base64
|
||||||
|
listing = [{'name': '20261021-imported.md', 'sha': 'upstream'}, {'name': '20261021-own.md', 'sha': 'own'}]
|
||||||
|
body = base64.b64encode(b'---\narea: server\ntitle: Our portable sessions\n---\n').decode()
|
||||||
|
with patch.object(sync, 'api', side_effect=[listing, {'content': body}]) as calls:
|
||||||
|
notes, consumed = sync.remote_fragments('owner/core', 'a' * 40, set(), sync.SERVER_AREAS, {'upstream'})
|
||||||
|
self.assertEqual(notes, ['Our portable sessions'])
|
||||||
|
self.assertEqual(len(consumed), 2)
|
||||||
|
self.assertEqual(calls.call_count, 2)
|
||||||
|
self.assertTrue(calls.call_args.args[0].endswith('/git/blobs/own'))
|
||||||
|
|
||||||
|
def test_upstream_exclusions_use_the_frozen_source_tree(self):
|
||||||
|
lock = {'components': {'upstream': {'repository': 'upstream/core', 'sha': 'frozen'}}}
|
||||||
|
with patch.object(sync, 'api', side_effect=[{'tree': [{'path': 'changelog.d', 'type': 'tree', 'sha': 'notes-tree'}]}, {'tree': [{'path': '20261021-imported.md', 'type': 'blob', 'sha': 'imported'}, {'path': 'README.md', 'type': 'blob', 'sha': 'readme'}]}]) as calls:
|
||||||
|
self.assertEqual(sync.upstream_fragment_blobs(lock), {'imported'})
|
||||||
|
self.assertEqual(calls.call_args_list[0].args[0], 'repos/upstream/core/git/trees/frozen')
|
||||||
|
self.assertEqual(calls.call_args_list[1].args[0], 'repos/upstream/core/git/trees/notes-tree')
|
||||||
|
|
||||||
def test_render_is_component_scoped_and_stable(self):
|
def test_render_is_component_scoped_and_stable(self):
|
||||||
text = sync.render(self.history())
|
text = sync.render(self.history())
|
||||||
self.assertIn('# CoA Server Manager changelog', text)
|
self.assertIn('# CoA Server Manager changelog', text)
|
||||||
|
|||||||
Reference in new issue
Block a user