Merge branch 'main' into Hani/clear_from_name_org

Author: Hani Yacoub

.github/workflows/check-devedition.yml

@@ -2,7 +2,7 @@ name: Check new devedition version
 
 on:
   schedule:
-    - cron: "46 */12 * * *"
+    - cron: "38 * * * *"
 env:
   LATEST: ""
 permissions:
@@ -30,17 +30,17 @@ jobs:
           echo win=$(pipenv run python -c 'from modules import testrail_integration as tri; print(tri.reportable("Windows"))') >> "$GITHUB_OUTPUT"
           echo mac=$(pipenv run python -c 'from modules import testrail_integration as tri; print(tri.reportable("Darwin"))') >> "$GITHUB_OUTPUT"
   Run-Win-Smoke:
-    needs: Check-Beta-Version
-    if: ${{ needs.Check-Beta-Version.outputs.win_reportable == 'True' }}
+    needs: Check-DevEdition-Version
+    if: ${{ needs.Check-DevEdition-Version.outputs.win_reportable == 'True' }}
     uses: ./.github/workflows/smoke.yml
     with:
       channel: "devedition"
       job_to_run: Smoke-Windows
     secrets: inherit
 
   Run-Mac-Smoke:
-    needs: Check-Beta-Version
-    if: ${{ needs.Check-Beta-Version.outputs.mac_reportable == 'True' }}
+    needs: Check-DevEdition-Version
+    if: ${{ needs.Check-DevEdition-Version.outputs.mac_reportable == 'True' }}
     uses: ./.github/workflows/smoke.yml
     with:
       channel: "devedition"

modules/testrail_integration.py

@@ -98,8 +98,12 @@ def reportable(platform_to_test=None):
     logging.warning(f"Got version from collect_executable.py! {version}")
     tr_session = testrail_init()
     major_number, second_half = version.split(".")
-    minor_num, build_num = second_half.split("-")
-    channel = os.environ.get("FX_CHANNEL").title()
+    if "-" in second_half:
+        minor_num, _ = second_half.split("-")
+    else:
+        minor_num = second_half
+    channel = os.environ.get("FX_CHANNEL") or "beta"
+    channel = channel.title()
     if not channel:
         if "b" in minor_num:
             channel = "Beta"