From e59cd8086811aa15ab910af32707fc762458918a Mon Sep 17 00:00:00 2001
From: ay-ex <127405908+ay-ex@users.noreply.github.com>
Date: Fri, 28 Jun 2024 09:33:58 +0000
Subject: [PATCH] fix choco release (#4941)

* fix choco action

* fix choco action env vars

* fix choco action env vars

* fix choco action py version source regex
---
 .github/workflows/ci-blenderbim-choco.yml    | 15 ++++++++-------
 choco/blenderbim/check_repo_infos.py         |  2 +-
 choco/blenderbim/fill_dynamic_parameters.py  |  4 ++--
 choco/blenderbim/tools/chocolateyinstall.ps1 |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci-blenderbim-choco.yml b/.github/workflows/ci-blenderbim-choco.yml
index edb2b3bc1d..11a9316393 100644
--- a/.github/workflows/ci-blenderbim-choco.yml
+++ b/.github/workflows/ci-blenderbim-choco.yml
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pyver: [py310]
+        pyver: [py311]
         config:
           - {
             name: "Windows Build",
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2 # https://github.com/actions/setup-python
         with:
-          python-version: '3.11.7' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+          python-version: '3.11.9' # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
       - run: echo ${{ env.DATE }}
 
@@ -66,12 +66,14 @@ jobs:
           export latest_blender_version_maj_min_pat=$(python3 check_repo_infos.py --latest_blender_release_maj_min_pat?) &&
           echo   latest_blender_version_maj_min_pat?: $latest_blender_version_maj_min_pat &&
           export blenderbim_build_version="${{ env.major }}.${{ env.minor }}.$yesterday_non_iso" &&
-          export url_blenderbim_py3x_win_zip="https://github.com/IfcOpenShell/IfcOpenShell/releases/download/blenderbim-$yesterday_non_iso/$target_release_tag-$pyver-$target_os.zip" &&
+          export url_blenderbim_py3x_win_zip="https://github.com/IfcOpenShell/IfcOpenShell/releases/download/$target_release_tag/$target_release_tag-$pyver-$target_os.zip" &&
           wget $url_blenderbim_py3x_win_zip --no-verbose &&
-          export sha256sum_blenderbim_py310_win_zip=$( sha256sum $target_release_tag-$pyver-$target_os.zip  --tag | cut -d ' ' -f 4  | tr -d '\n') &&
-          echo   sha256sum_blenderbim_py310_win_zip: $sha256sum_blenderbim_py310_win_zip &&
-          python3 choco/blenderbim/fill_dynamic_parameters.py &&
+          export sha256sum_blenderbim_py3x_win_zip=$( sha256sum $target_release_tag-$pyver-$target_os.zip  --tag | cut -d ' ' -f 4  | tr -d '\n') &&
+          echo   sha256sum_blenderbim_py3x_win_zip: $sha256sum_blenderbim_py3x_win_zip &&
+          python3 fill_dynamic_parameters.py &&
           echo __build choco with mono &&
+          mkdir /tmp/choco/ &&
+          cd /tmp/choco/ &&
           wget "https://github.com/chocolatey/choco/archive/refs/tags/$choco_version.tar.gz" --quiet &&
           tar -xzf "$choco_version.tar.gz" &&
           cd choco-$choco_version &&
@@ -80,7 +82,6 @@ jobs:
           cp -r build_output/chocolatey /opt/chocolatey &&
           cd /home/runner/work/IfcOpenShell/IfcOpenShell/choco/blenderbim/ &&
           echo __choco pack &&
-          mono /opt/chocolatey/choco.exe --version &&
           mono /opt/chocolatey/choco.exe pack --allow-unofficial &&
           echo __choco set apiKey &&
           mono /opt/chocolatey/choco.exe setapikey --key="$CHOCO_TOKEN" --source="https://push.chocolatey.org/" --allow-unofficial # &&
diff --git a/choco/blenderbim/check_repo_infos.py b/choco/blenderbim/check_repo_infos.py
index 786241cff6..90ba68d073 100644
--- a/choco/blenderbim/check_repo_infos.py
+++ b/choco/blenderbim/check_repo_infos.py
@@ -28,7 +28,7 @@ URL_CHOCO_PACKAGE  = "https://community.chocolatey.org/packages/blender"
 URL_BLENDER_CMAKE  = "https://raw.githubusercontent.com/blender/blender/{}/build_files/cmake/Modules/FindPythonLibsUnix.cmake"
 RE_BLENDER_VERSION_MIN_MAJ        = r"Latest Version.+<span>Blender (\d+\.\d+)\..+</span>"
 RE_BLENDER_VERSION_MIN_MAJ_PAT    = r"Latest Version.+<span>Blender (\d+\.\d+\.\d+)</span>"
-RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"SET\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
+RE_BLENDER_PYTHON_VERSION_MAJ_MIN = r"\(_PYTHON_VERSION_SUPPORTED (\d+\.\d+)\)"
 
 
 if   sys.argv[1] == "--latest_blender_release_maj_min_pat?":
diff --git a/choco/blenderbim/fill_dynamic_parameters.py b/choco/blenderbim/fill_dynamic_parameters.py
index 738a779b91..2bae8766d8 100644
--- a/choco/blenderbim/fill_dynamic_parameters.py
+++ b/choco/blenderbim/fill_dynamic_parameters.py
@@ -17,8 +17,8 @@ topics = {
     "install": {
         "path": HERE_DIR / "tools" / "chocolateyinstall.ps1",
         "env_vars": {
-            "url_blenderbim_py310_win_zip",
-            "sha256sum_blenderbim_py310_win_zip",
+            "url_blenderbim_py3x_win_zip",
+            "sha256sum_blenderbim_py3x_win_zip",
             "latest_blender_version_maj_min",
         },
     },
diff --git a/choco/blenderbim/tools/chocolateyinstall.ps1 b/choco/blenderbim/tools/chocolateyinstall.ps1
index 57d7da03ce..fe8c79d60a 100644
--- a/choco/blenderbim/tools/chocolateyinstall.ps1
+++ b/choco/blenderbim/tools/chocolateyinstall.ps1
@@ -1,7 +1,7 @@
 $ErrorActionPreference = 'Stop'
 
-$url64          = 'url_blenderbim_py310_win_zip'
-$checksum64     = 'sha256sum_blenderbim_py310_win_zip'
+$url64          = 'url_blenderbim_py3x_win_zip'
+$checksum64     = 'sha256sum_blenderbim_py3x_win_zip'
 $checksumType64 = 'sha256'
 
 $appDataUserDir  = [System.Environment]::GetEnvironmentVariable('appdata')