- Introduces the `RDIFF_ACCEPT_NEW_GOLDENS` commit message tag. - Conditionally skip the `test-renderdiff` presubmit comparison if this tag is present. - Extracts renderdiff generation into a reusable `.github/actions/renderdiff-generate` composite action. - Modifies `postsubmit-main.yml` to automatically generate new goldens and push them to a temporary `accept-goldens-<short-hash>` branch before merging them into `main` when the tag is found.
77 lines
2.1 KiB
Python
77 lines
2.1 KiB
Python
# Copyright (C) 2025 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import sys
|
|
import re
|
|
|
|
from utils import execute, ArgParseImpl
|
|
|
|
RDIFF_UPDATE_GOLDEN_STR = 'RDIFF_BRANCH'
|
|
RDIFF_ACCEPT_NEW_GOLDENS_STR = 'RDIFF_ACCEPT_NEW_GOLDENS'
|
|
|
|
def _parse_commit(commit_str):
|
|
lines = commit_str.split('\n')
|
|
if len(lines) >= 5:
|
|
commit, author, date, _, title, *desc = lines
|
|
else:
|
|
print(commit_str, file=sys.stderr)
|
|
return (commit_str, '', '')
|
|
|
|
commit = commit.split(' ')[1]
|
|
title = title.strip()
|
|
|
|
desc = [l.strip() for l in desc[1:]]
|
|
while len(desc) > 0 and len(desc[0]) == 0:
|
|
desc = desc[1:]
|
|
|
|
return (
|
|
commit,
|
|
title,
|
|
desc
|
|
)
|
|
|
|
if __name__ == "__main__":
|
|
RE_STR = rf"{RDIFF_UPDATE_GOLDEN_STR}(?:\s)?\=(?:\s)?([a-zA-Z0-9\s\-\/]+)"
|
|
RE_ACCEPT = rf"^{RDIFF_ACCEPT_NEW_GOLDENS_STR}$"
|
|
|
|
parser = ArgParseImpl()
|
|
parser.add_argument('--file', help='A file containing the commit message')
|
|
parser.add_argument('--mode', choices=['branch', 'accept_new_goldens'], default='branch', help='Mode of operation')
|
|
args, _ = parser.parse_known_args(sys.argv[1:])
|
|
|
|
if not args.file:
|
|
msg = sys.stdin.read()
|
|
else:
|
|
with open(args.file, 'r') as f:
|
|
msg = f.read()
|
|
|
|
commit, title, description = _parse_commit(msg)
|
|
|
|
if args.mode == 'accept_new_goldens':
|
|
for line in description:
|
|
if re.match(RE_ACCEPT, line):
|
|
sys.exit(0)
|
|
sys.exit(1)
|
|
|
|
# args.mode == 'branch'
|
|
for line in description:
|
|
m = re.match(RE_STR, line)
|
|
if not m:
|
|
continue
|
|
print(m.group(1))
|
|
sys.exit(0)
|
|
|
|
# Always default to the main branch
|
|
print('main')
|