Skip to content

Commit

Permalink
Merge pull request #209 from jakub-nt/ENT-12098
Browse files Browse the repository at this point in the history
ENT-12486: Removed checkout tag special-casing after the masterfiles tags had been recreated, added git-fetch arguments needed to correctly fetch recreated tags
  • Loading branch information
olehermanse authored Nov 26, 2024
2 parents 7affc57 + e463ac3 commit 7fa6886
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions cfbs/masterfiles/generate_vcf_git_checkout.py
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

0 comments on commit 7fa6886

Please sign in to comment.