From 613b4105a2f07075bfb66cb33685dbdb67b17c5f Mon Sep 17 00:00:00 2001
From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Date: Mon, 13 Nov 2023 23:52:22 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Fix=20updated=20build=20script?=
 =?UTF-8?q?=20(#26423)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Followup to #26265

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
---
 .github/workflows/test-builds.yml               |  1 +
 .../scripts/generic_create_variant.py           |  8 ++++----
 buildroot/tests/STM32H743VI_btt                 | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100755 buildroot/tests/STM32H743VI_btt

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index ff4e7ee648..44554f8b7a 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -118,6 +118,7 @@ jobs:
 
         # STM32H7
         - BTT_SKR_SE_BX
+        - STM32H743VI_btt
 
         # STM32F1 (Maple)
         - jgaurora_a5s_a1_maple
diff --git a/buildroot/share/PlatformIO/scripts/generic_create_variant.py b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
index 457ef95d5a..54aeed5d1d 100644
--- a/buildroot/share/PlatformIO/scripts/generic_create_variant.py
+++ b/buildroot/share/PlatformIO/scripts/generic_create_variant.py
@@ -31,11 +31,11 @@ if pioutil.is_pio_build():
         }
         platform_name = framewords[platform.__class__.__name__]
     else:
-        uri = PackageSpec(platform_packages[0]).uri
-        if '@' in uri:
-            platform_name = re.sub(r'@.+', '' , uri)
+        spec = PackageSpec(platform_packages[0])
+        if spec.uri and '@' in spec.uri:
+            platform_name = re.sub(r'@.+', '', spec.uri)
         else:
-            platform_name = PackageSpec(platform_packages[0]).name
+            platform_name = spec.name
 
     FRAMEWORK_DIR = Path(platform.get_package_dir(platform_name))
     assert FRAMEWORK_DIR.is_dir()
diff --git a/buildroot/tests/STM32H743VI_btt b/buildroot/tests/STM32H743VI_btt
new file mode 100755
index 0000000000..48933e8c46
--- /dev/null
+++ b/buildroot/tests/STM32H743VI_btt
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Build tests for STM32H743VI_btt
+# Ender-5 Plus with SKR V3.0 (STM32H7)
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+use_example_configs "Creality/Ender-5 Plus/BigTreeTech SKR 3"
+exec_test $1 $2 "Creality Ender-5 Plus with BigTreeTech SKR 3" "$3"
+
+# clean up
+restore_configs