From 850782323d994ae64eb91c444d1615773ec9438f Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <pawlik.dan@gmail.com>
Date: Sun, 6 Oct 2024 16:32:40 +0200
Subject: [PATCH] Add choice option to create community image for BPI-R4

---
 .github/workflows/bpi-r4-BE14-community.yaml | 23 +++++++++++++++-----
 .github/workflows/bpi-r4-BE14.yaml           |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/bpi-r4-BE14-community.yaml b/.github/workflows/bpi-r4-BE14-community.yaml
index f109fec..7361df6 100644
--- a/.github/workflows/bpi-r4-BE14-community.yaml
+++ b/.github/workflows/bpi-r4-BE14-community.yaml
@@ -6,13 +6,26 @@ on:
   workflow_dispatch:
     inputs:
       DEVICE_CONFIG:
-        description: "Device configuration selection (default: non-poe)"
-        required: false
-        default: ""
+        description: "Device configuration selection: <none> or poe (default: non-poe)"
+        required: true
+        type: choice
+        default: 'non-poe'
+        options:
+          - poe
+          - non-poe
+
+      RMADRAD_VERSION:
+        description: "Should it use branch with rmadrad patch: true or false (default: false)"
+        type: choice
+        required: true
+        default: 'false'
+        options:
+          - true
+          - false
 
 env:
   REMOTE_REPOSITORY: danpawlik/openwrt
-  REMOTE_BRANCH: v14-luci-eht-rmadrad
+  REMOTE_BRANCH: v14-luci-eht${{ inputs.RMADRAD_VERSION == true && '-rmadrad' || '' }}
   RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_eht
   DEVICE_CONFIG: ${{ inputs.DEVICE_CONFIG == 'poe' && 'configs/mediatek/mt7988a/bpi-r4-poe' || 'configs/mediatek/mt7988a/bpi-r4' }}
   ROLE_CONFIG: configs/common/community
@@ -123,7 +136,7 @@ jobs:
           name: OpenWRT BPI-R4 ${{ env.DEVICE_CONFIG }} + BE14 + luci BE - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }}
           body: |
             Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, luci BE, basic 5G modem packages, that was
-            expected by the community members.
+            expected by the community members. ${{ inputs.RMADRAD_VERSION == true && 'That build contains Rmadrad patch' || '' }}
             Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }}
 
       - name: Clean up old releases
diff --git a/.github/workflows/bpi-r4-BE14.yaml b/.github/workflows/bpi-r4-BE14.yaml
index d164960..58efead 100644
--- a/.github/workflows/bpi-r4-BE14.yaml
+++ b/.github/workflows/bpi-r4-BE14.yaml
@@ -6,7 +6,7 @@ on:
 
 env:
   REMOTE_REPOSITORY: danpawlik/openwrt
-  REMOTE_BRANCH: v14-luci-eht-rmadrad
+  REMOTE_BRANCH: v14-luci-eht
   RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_eht
 
 jobs: