Cleanup CI - remove the skip_tests call, general cleanup. (#2423)

.github/workflows/merge-queue.yml

@@ -9,14 +9,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  # New job to satisfy the required check for the merge queue
-  # scheduled_updates:
-  #   if: github.repository == 'meshtastic/Meshtastic-Android' # Keep consistent with other jobs
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Always pass merge queue scheduled_updates check
-  #       run: echo "This check is primarily for PR entry; passing in merge queue."
-
   build_and_detekt:
     if: github.repository == 'meshtastic/Meshtastic-Android'
     uses: ./.github/workflows/reusable-android-build.yml
@@ -35,13 +27,13 @@ jobs:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
   check-workflow-status:
-    name: Check Workflow Status
+    name: Check Workflow Status  # Matches another in pull-request, and is required for merge to main.
     runs-on: ubuntu-latest
     needs:
       [
         build_and_detekt,
         androidTest
-        ]
+      ]
     if: always()
     steps:
       - name: Check Workflow Status

.github/workflows/pull-request.yml

@@ -10,38 +10,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  scheduled_updates:
-    if: github.head_ref == 'scheduled-updates'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Always pass for scheduled-updates
-        run: | 
-          echo Scheduled updates branch, auto-passing by default.
-          echo We could add an xml linter here.
-
-
   build_and_detekt:
-    if: github.repository == 'meshtastic/Meshtastic-Android'
+    if: github.repository == 'meshtastic/Meshtastic-Android' && github.head_ref != 'scheduled-updates'
     uses: ./.github/workflows/reusable-android-build.yml
-    with:
-      skip_tests: ${{ github.head_ref == 'scheduled-updates' }}
     secrets:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
     # inputs.upload_artifacts defaults to true, so no need to specify for PRs
 
   androidTest:
-    # AssumingandroidTest should also only run for the main repository
-    if: github.repository == 'meshtastic/Meshtastic-Android'
+    # Assuming androidTest should also only run for the main repository
+    if: github.repository == 'meshtastic/Meshtastic-Android' && github.head_ref != 'scheduled-updates'
     uses: ./.github/workflows/reusable-android-test.yml
     with:
       api_levels: '[35]' # Run only on API 35 for PRs
-      skip_tests: ${{ github.head_ref == 'scheduled-updates' }}
       # upload_artifacts defaults to true, so no need to explicitly set
     secrets:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
   check-workflow-status:
-    name: Check Workflow Status
+    name: Check Workflow Status # Matches another in merge-queue, and is required.
     runs-on: ubuntu-latest
     needs:
       [

.github/workflows/reusable-android-build.yml

@@ -8,11 +8,6 @@ on:
         required: false
         type: boolean
         default: true
-      skip_tests:
-        description: 'Whether to skip running tests'
-        required: false
-        type: boolean
-        default: false
     secrets:
       GRADLE_ENCRYPTION_KEY:
         required: false
@@ -21,7 +16,6 @@ jobs:
   build_and_detekt:
     runs-on: ubuntu-latest
     timeout-minutes: 35
-    if: ${{ !inputs.skip_tests }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/reusable-android-test.yml

@@ -13,18 +13,12 @@ on:
         required: false
         type: string
         default: '[26, 35]' # Default to running both if not specified by caller
-      skip_tests:
-        description: 'Whether to skip running tests'
-        required: false
-        type: boolean
-        default: false
     secrets:
       GRADLE_ENCRYPTION_KEY:
         required: false
 
 jobs:
   androidTest:
-    if: ${{ !inputs.skip_tests }}
     runs-on: ubuntu-latest
     timeout-minutes: 25
     strategy: