From b249aef8315f2f7245f4b3b2de20f6b22548a057 Mon Sep 17 00:00:00 2001 From: Jacob Oursland Date: Wed, 16 Apr 2025 12:31:47 -0700 Subject: [PATCH] CI: update weekly bundle scripts for Windows and Linux. --- package/rattler-build/linux/create_bundle.sh | 3 +-- package/rattler-build/windows/create_bundle.sh | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package/rattler-build/linux/create_bundle.sh b/package/rattler-build/linux/create_bundle.sh index 80d4d5eaf0..aeda9617fb 100755 --- a/package/rattler-build/linux/create_bundle.sh +++ b/package/rattler-build/linux/create_bundle.sh @@ -49,9 +49,8 @@ rm -rf ${conda_env}/lib/cmake/ find . -name "*.h" -type f -delete find . -name "*.cmake" -type f -delete -build_tag=$(git describe --tags) python_version=$(python -c 'import platform; print("py" + platform.python_version_tuple()[0] + platform.python_version_tuple()[1])') -version_name="FreeCAD_${build_tag}-Linux-$(uname -m)-${python_version}" +version_name="FreeCAD_${BUILD_TAG}-Linux-$(uname -m)-${python_version}" echo -e "\################" echo -e "version_name: ${version_name}" diff --git a/package/rattler-build/windows/create_bundle.sh b/package/rattler-build/windows/create_bundle.sh index b5fe5c3db0..6d18c8730e 100644 --- a/package/rattler-build/windows/create_bundle.sh +++ b/package/rattler-build/windows/create_bundle.sh @@ -55,10 +55,8 @@ cp ssl-patch.py ${copy_dir}/bin/Lib/ssl.py echo '[Paths]' >> ${copy_dir}/bin/qt6.conf echo 'Prefix = ../lib/qt6' >> ${copy_dir}/bin/qt6.conf -build_tag=$(git describe --tags) python_version=$(python -c 'import platform; print("py" + platform.python_version_tuple()[0] + platform.python_version_tuple()[1])') -version_name="FreeCAD_${build_tag}-Windows-$(uname -m)-${python_version}" -application_menu_name="FreeCAD_${build_tag}" +version_name="FreeCAD_${BUILD_TAG}-Windows-$(uname -m)-${python_version}" echo -e "################" echo -e "version_name: ${version_name}"