From d50bfc5bd8e996fa51634af8f2018042c3be75e8 Mon Sep 17 00:00:00 2001
From: Sadek Baroudi <sadekbaroudi@gmail.com>
Date: Mon, 31 Oct 2022 01:50:41 -0700
Subject: [PATCH] switched stemcell builds from rules.mk to just part of the
 github build action

---
 bin/fp_build.sh                                    | 3 +++
 keyboards/fingerpunch/ffkb_byomcu/v2/fp_build.json | 4 ++++
 keyboards/fingerpunch/ffkb_byomcu/v2/rules.mk      | 2 --
 keyboards/fingerpunch/ffkb_byomcu/v3/fp_build.json | 4 ++++
 keyboards/fingerpunch/ffkb_byomcu/v3/rules.mk      | 2 --
 keyboards/fingerpunch/rockon/v2/fp_build.json      | 6 +++++-
 keyboards/fingerpunch/rockon/v2/rules.mk           | 2 --
 keyboards/fingerpunch/rockon/v3/fp_build.json      | 4 ++++
 keyboards/fingerpunch/rockon/v3/rules.mk           | 2 --
 9 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/bin/fp_build.sh b/bin/fp_build.sh
index 59ef76e349..0d23c8d5a5 100755
--- a/bin/fp_build.sh
+++ b/bin/fp_build.sh
@@ -160,6 +160,9 @@ make_build_string_recursive() {
 		local param_name=$(cat "${build_json}" | jq -r ".[${param_number}].name")
 		make_build_string_recursive "${build_json}" "${run_build}" $next_param_number "${build_string_base} ${param_name}=yes"
 		make_build_string_recursive "${build_json}" "${run_build}" $next_param_number "${build_string_base} ${param_name}=no"
+    elif [[ "${param_type}" == "convert-to" ]]; then
+		local param_name=$(cat "${build_json}" | jq -r ".[${param_number}].name")
+        make_build_string_recursive "${build_json}" "${run_build}" $next_param_number "${build_string_base} CONVERT_TO=${param_name}"
     else
         echo "invalid type in json file: ${param_type}"
         exit
diff --git a/keyboards/fingerpunch/ffkb_byomcu/v2/fp_build.json b/keyboards/fingerpunch/ffkb_byomcu/v2/fp_build.json
index d9e508ce2d..71bbcd8147 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/v2/fp_build.json
+++ b/keyboards/fingerpunch/ffkb_byomcu/v2/fp_build.json
@@ -1,4 +1,8 @@
 [
+    {
+        "type" : "convert-to",
+        "name" : "stemcell"
+    },
     {
         "type" : "single",
         "name" : "CIRQUE_ENABLE",
diff --git a/keyboards/fingerpunch/ffkb_byomcu/v2/rules.mk b/keyboards/fingerpunch/ffkb_byomcu/v2/rules.mk
index deea23db20..787d69a9a8 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/v2/rules.mk
+++ b/keyboards/fingerpunch/ffkb_byomcu/v2/rules.mk
@@ -40,8 +40,6 @@ EXTRAFLAGS     += -flto     # macros disabled, as a lot of barobord features req
                             # for instance, if you build "no_features", it's very unlikely you'll need to disable macros
 MOUSEKEY_ENABLE = no
 
-CONVERT_TO = stemcell
-
 CIRQUE_ENABLE = no
 
 ifeq ($(strip $(CIRQUE_ENABLE)), yes)
diff --git a/keyboards/fingerpunch/ffkb_byomcu/v3/fp_build.json b/keyboards/fingerpunch/ffkb_byomcu/v3/fp_build.json
index ca946ce18b..375285fc11 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/v3/fp_build.json
+++ b/keyboards/fingerpunch/ffkb_byomcu/v3/fp_build.json
@@ -1,4 +1,8 @@
 [
+    {
+        "type" : "convert-to",
+        "name" : "stemcell"
+    },
     {
         "type" : "single",
         "name" : "CIRQUE_ENABLE",
diff --git a/keyboards/fingerpunch/ffkb_byomcu/v3/rules.mk b/keyboards/fingerpunch/ffkb_byomcu/v3/rules.mk
index e407e0eb90..770a3cdd41 100644
--- a/keyboards/fingerpunch/ffkb_byomcu/v3/rules.mk
+++ b/keyboards/fingerpunch/ffkb_byomcu/v3/rules.mk
@@ -39,8 +39,6 @@ OLED_ENABLE = no            # this can be yes or no depending on if you have an
 EXTRAFLAGS     += -flto     # macros disabled, as a lot of barobord features require more space, can move this line into all the individual rules.mk, only where needed
                             # for instance, if you build "no_features", it's very unlikely you'll need to disable macros
 
-CONVERT_TO = stemcell
-
 SRC += keyboards/fingerpunch/fp_matrix_74hc595_spi.c
 QUANTUM_LIB_SRC += spi_master.c
 CUSTOM_MATRIX = lite
diff --git a/keyboards/fingerpunch/rockon/v2/fp_build.json b/keyboards/fingerpunch/rockon/v2/fp_build.json
index b30bf093fd..21936ccb31 100644
--- a/keyboards/fingerpunch/rockon/v2/fp_build.json
+++ b/keyboards/fingerpunch/rockon/v2/fp_build.json
@@ -1,4 +1,8 @@
 [
+    {
+        "type" : "convert-to",
+        "name" : "stemcell"
+    },
     {
         "type" : "single",
         "name" : "CIRQUE_ENABLE",
@@ -24,4 +28,4 @@
         "name" : "PIMORONI_TRACKBALL_ENABLE",
         "user_input": "Do you have a pimoroni trackball?"
     }
-]
\ No newline at end of file
+]
diff --git a/keyboards/fingerpunch/rockon/v2/rules.mk b/keyboards/fingerpunch/rockon/v2/rules.mk
index 50e506cc64..64367c983f 100644
--- a/keyboards/fingerpunch/rockon/v2/rules.mk
+++ b/keyboards/fingerpunch/rockon/v2/rules.mk
@@ -42,8 +42,6 @@ ENCODER_ENABLE = no
 OLED_ENABLE = no
 # EXTRAFLAGS     += -flto     # macros disabled, if you need the extra space
 
-CONVERT_TO = stemcell
-
 ifeq ($(strip $(CIRQUE_ENABLE)), yes)
    MOUSEKEY_ENABLE := yes  # not required, but enabling for mouse button keys
    POINTING_DEVICE_ENABLE := yes
diff --git a/keyboards/fingerpunch/rockon/v3/fp_build.json b/keyboards/fingerpunch/rockon/v3/fp_build.json
index 867f56d42d..6009b5b102 100644
--- a/keyboards/fingerpunch/rockon/v3/fp_build.json
+++ b/keyboards/fingerpunch/rockon/v3/fp_build.json
@@ -1,4 +1,8 @@
 [
+    {
+        "type" : "convert-to",
+        "name" : "stemcell"
+    },
     {
         "type" : "single",
         "name" : "CIRQUE_ENABLE",
diff --git a/keyboards/fingerpunch/rockon/v3/rules.mk b/keyboards/fingerpunch/rockon/v3/rules.mk
index 26306bf9bd..4165e3c1b1 100644
--- a/keyboards/fingerpunch/rockon/v3/rules.mk
+++ b/keyboards/fingerpunch/rockon/v3/rules.mk
@@ -39,8 +39,6 @@ ENCODER_ENABLE = no
 # EXTRAFLAGS     += -flto     # macros disabled, if you need the extra space
 MOUSEKEY_ENABLE = no
 
-CONVERT_TO = stemcell
-
 SRC += keyboards/fingerpunch/fp_matrix_74hc595_spi.c
 QUANTUM_LIB_SRC += spi_master.c
 CUSTOM_MATRIX = lite