From dce0c8b9ef6c1a346463deb70839141088fae60a Mon Sep 17 00:00:00 2001 From: Lorenz Lechner Date: Sun, 29 Dec 2024 16:17:21 +0100 Subject: [PATCH 1/4] use sha256 sum --- recipe/increase_build_number.py | 16 +++++++++++++++- recipe/meta.yaml | 3 ++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/recipe/increase_build_number.py b/recipe/increase_build_number.py index 7a0848a3..d38ff620 100644 --- a/recipe/increase_build_number.py +++ b/recipe/increase_build_number.py @@ -1,13 +1,27 @@ #!/usr/bin/env python import re +import requests + +# read meta.yaml file with open("recipe/meta.yaml", "r") as f: text = f.read() +# increase build number build_number_old = int(re.search(r"(?<={% set build_number = )\d+", text)[0]) build_number_new = build_number_old + 1 print(f"set build_number from build_number {build_number_old} to {build_number_new}") text = re.sub(r"(?<={% set build_number = )\d+", str(build_number_new), text) + +# set sha256sum +url = "https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/weekly-builds/freecad_source_sha256sum.txt" +response = requests.get(url) +response.raise_for_status() +sha256 = response.content.decode('utf-8') +print(f"set sha256: {sha256}") +text = re.sub(r"(?<={% set sha256 = )\d+", str(sha256), text) + +# write meta.yaml file with open("recipe/meta.yaml", "w") as f: - f.write(text) + f.write(text) \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 432c4932..5797a731 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,6 +2,7 @@ {% set version = "1.1dev" %} {% set build_number = 34 %} {% set build_number = build_number + 500 %} # [FEATURE_DEBUG] +{% set sha256 = 65dc32f217a3fe757f5b81bb45dae0cc151c82304e8016ddcc9efbd46fbbc864 %} package: name: {{ name }} @@ -10,7 +11,7 @@ package: source: url: https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/weekly-builds/freecad_source.tar.gz fn: freecad_source_{{ build_number }}.tar.gz - # sha256: + sha256: {{ sha256 }} patches: - patches/osx_arm64_cross_compiling.patch # [build_platform != target_platform and osx] From a34375a6b588a5030c355efdf304cf3134c61cec Mon Sep 17 00:00:00 2001 From: lorenz Date: Tue, 31 Dec 2024 12:25:56 +0100 Subject: [PATCH 2/4] Update recipe/increase_build_number.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Adrián Insaurralde Avalos <36372335+adrianinsaval@users.noreply.github.com> --- recipe/increase_build_number.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/increase_build_number.py b/recipe/increase_build_number.py index d38ff620..15f2a2a6 100644 --- a/recipe/increase_build_number.py +++ b/recipe/increase_build_number.py @@ -15,7 +15,7 @@ text = re.sub(r"(?<={% set build_number = )\d+", str(build_number_new), text) # set sha256sum -url = "https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/weekly-builds/freecad_source_sha256sum.txt" +url = "https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/weekly-builds/freecad_source.tar.gz-SHA256.txt" response = requests.get(url) response.raise_for_status() sha256 = response.content.decode('utf-8') From 5294e796cee21220914f8c425676eec4799bf045 Mon Sep 17 00:00:00 2001 From: lorenz Date: Tue, 31 Dec 2024 12:26:06 +0100 Subject: [PATCH 3/4] Update recipe/meta.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Adrián Insaurralde Avalos <36372335+adrianinsaval@users.noreply.github.com> --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5797a731..6f5cfc4e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,7 +2,7 @@ {% set version = "1.1dev" %} {% set build_number = 34 %} {% set build_number = build_number + 500 %} # [FEATURE_DEBUG] -{% set sha256 = 65dc32f217a3fe757f5b81bb45dae0cc151c82304e8016ddcc9efbd46fbbc864 %} +{% set sha256 = "5fbfb92908b23611308b733bb1679bd1610c37d6fce26320af8ae709f16dc526" %} package: name: {{ name }} From 4b625deb82386b758b42e53d2b58a882792132ac Mon Sep 17 00:00:00 2001 From: lorenz Date: Tue, 31 Dec 2024 12:33:12 +0100 Subject: [PATCH 4/4] Update increase_build_number.py --- recipe/increase_build_number.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/increase_build_number.py b/recipe/increase_build_number.py index 15f2a2a6..3366601b 100644 --- a/recipe/increase_build_number.py +++ b/recipe/increase_build_number.py @@ -20,8 +20,8 @@ response.raise_for_status() sha256 = response.content.decode('utf-8') print(f"set sha256: {sha256}") -text = re.sub(r"(?<={% set sha256 = )\d+", str(sha256), text) +text = re.sub(r'(?<={% set sha256 = ")[a-fA-F0-9]+(?=" %})', str(sha256), text) # write meta.yaml file with open("recipe/meta.yaml", "w") as f: - f.write(text) \ No newline at end of file + f.write(text)