Skip to content

ENT-12486: Removed checkout tag special-casing after the masterfiles tags had been recreated, added git-fetch arguments needed to correctly fetch recreated tags #209

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
olehermanse merged 1 commit into from
Nov 26, 2024
Merged

ENT-12486: Removed checkout tag special-casing after the masterfiles tags had been recreated, added git-fetch arguments needed to correctly fetch recreated tags #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 2 additions & 15 deletions cfbs/masterfiles/generate_vcf_git_checkout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def generate_vcf_git_checkout(checkout_tags):
)
else:
subprocess.run(
["git", "fetch", "--all"],
["git", "fetch", "--all", "--tags", "--force"],
cwd=MPF_PATH,
check=True,
)
Expand All @@ -51,22 +51,9 @@ def generate_vcf_git_checkout(checkout_tags):
for tag in checkout_tags:
print("Checking out tag", tag)

# checking out some tags equal to the downloaded version doesn't result in the same files
# the downloadable files are reproducible by checking out specific tags
if tag == "3.18.0":
checkout_tag = "3.18.0-2"
elif tag == "3.15.4":
checkout_tag = "3.15.4-2-build2"
elif tag == "3.12.3":
checkout_tag = "3.12.3-build7"
elif tag == "3.7.7":
checkout_tag = "3.7.7-build1"
else:
checkout_tag = tag

# check out the version
subprocess.run(
["git", "checkout", checkout_tag],
["git", "checkout", tag],
cwd=MPF_PATH,
check=True,
stdout=subprocess.DEVNULL,
Expand Down
Loading