From e463ac3e45ca2ef58167437bcadde12aef8910d1 Mon Sep 17 00:00:00 2001 From: jakub-nt <175944085+jakub-nt@users.noreply.github.com> Date: Tue, 26 Nov 2024 17:37:12 +0100 Subject: [PATCH] Removed checkout tag special-casing after the masterfiles had been recreated, added git-fetch arguments needed to correctly fetch recreated tags Signed-off-by: jakub-nt <175944085+jakub-nt@users.noreply.github.com> --- cfbs/masterfiles/generate_vcf_git_checkout.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/cfbs/masterfiles/generate_vcf_git_checkout.py b/cfbs/masterfiles/generate_vcf_git_checkout.py index 95a0e9c4..6422bf8b 100644 --- a/cfbs/masterfiles/generate_vcf_git_checkout.py +++ b/cfbs/masterfiles/generate_vcf_git_checkout.py @@ -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, ) @@ -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,