Skip to content

{Packaging/Homebrew} Remove patch when upgrade #12344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fengzhou-msft merged 2 commits into from
Feb 26, 2020
Merged

{Packaging/Homebrew} Remove patch when upgrade #12344

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
368a4d6
{Homebrew} remove patch when upgrade
fengzhou-msft Feb 25, 2020
69a822e
fix string match
fengzhou-msft Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
{Homebrew} remove patch when upgrade
  • Loading branch information
@fengzhou-msft
fengzhou-msft committed Feb 25, 2020
commit 368a4d6dc82280929f6171b75bdff8a4e2537678
12 changes: 11 additions & 1 deletion scripts/release/homebrew/docker/formula_generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ def update_formula() -> str:
packs_to_remove = set()
lines = text.split('\n')
node_index_dict = OrderedDict()
line_idx_to_remove = set()
upgrade = False
for idx, line in enumerate(lines):
if line.strip().startswith("resource"):
m = re.search(r'resource "(.*)" do', line)
Expand All @@ -141,15 +143,22 @@ def update_formula() -> str:
if line.strip().startswith("url"):
#update the url of package
if pack in nodes.keys():
lines[idx] = re.sub('url ".*"', 'url "{}"'.format(nodes[pack]['url']), line, 1)
url_match = re.search(r'url "(.*)"', line)
if url_match is not None and nodes[pack]['url'] != url_match.group(1):
lines[idx] = re.sub('url ".*"', 'url "{}"'.format(nodes[pack]['url']), line, 1)
upgrade = True
else:
packs_to_remove.add(pack)
elif line.strip().startswith("sha256"):
#update the sha256 of package
if pack in nodes.keys():
lines[idx] = re.sub('sha256 ".*"', 'sha256 "{}"'.format(nodes[pack]['checksum']), line, 1)
del nodes[pack]
elif line.strip().startswith(" end"):
pack = None
upgrade = False
elif upgrade: # In case of upgrading, remove any patch following url and sha256 but before end
line_idx_to_remove.add(idx)
elif line.strip().startswith('def install'):
if nodes:
# add new dependency packages
Expand All @@ -159,6 +168,7 @@ def update_formula() -> str:
line_idx = list(node_index_dict.items())[i][1]
resource = RESOURCE_TEMPLATE.render(resource=node)
lines[line_idx] = resource + '\n\n' + lines[line_idx]
lines = [line for idx, line in enumerate(lines) if idx not in line_idx_to_remove]
new_text = "\n".join(lines)

# remove dependency packages that are no longer needed
Expand Down