From 4b42cc14196ddf4707ea4211032290fc9e41fa89 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Sat, 4 Oct 2025 13:51:31 -0500
Subject: [PATCH] fix(release): simplify build condition for internal channel
 (#3336)

---
 .../workflows/create-or-promote-release.yml   | 10 ++++----
 .github/workflows/release.yml                 | 25 +++++++++++++++----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/create-or-promote-release.yml b/.github/workflows/create-or-promote-release.yml
index 2787fbcfa..049cd069a 100644
--- a/.github/workflows/create-or-promote-release.yml
+++ b/.github/workflows/create-or-promote-release.yml
@@ -50,16 +50,16 @@ jobs:
           else
             # Pre-release channels get an incrementing number
             LATEST_TAG=$(git tag --list "v${BASE_VERSION}-${CHANNEL}.*" --sort=-v:refname | head -n 1)
-            
+
             if [ -z "$LATEST_TAG" ]; then
               INCREMENT=1
             else
               INCREMENT=$(echo "$LATEST_TAG" | sed -n "s/.*-${CHANNEL}\.\([0-9]*\)/\1/p" | awk '{print $1+1}')
             fi
-            
+
             NEW_TAG="v${BASE_VERSION}-${CHANNEL}.${INCREMENT}"
           fi
-          
+
           echo "Calculated new tag: $NEW_TAG"
           echo "new_tag=$NEW_TAG" >> $GITHUB_OUTPUT
         shell: bash
@@ -69,12 +69,12 @@ jobs:
         run: |
           git tag ${{ steps.calculate_new_tag.outputs.new_tag }}
           git push origin ${{ steps.calculate_new_tag.outputs.new_tag }}
-  
+
   call-release-workflow:
     if: ${{ !inputs.dry_run }}
     needs: create-tag
     uses: ./.github/workflows/release.yml
     with:
       tag_name: ${{ needs.create-tag.outputs.new_tag }}
-      release_type: ${{ inputs.channel == 'internal' && 'internal' || 'promotion' }}
+      channel: ${{ inputs.channel }}
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 11c1eae7d..a8d5f4f1f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,8 +7,8 @@ on:
         description: 'The tag that triggered the release'
         required: true
         type: string
-      release_type:
-        description: 'Type of release (internal or promotion)'
+      channel:
+        description: 'The channel to create a release for or promote to'
         required: true
         type: string
     secrets:
@@ -43,6 +43,7 @@ permissions:
 
 jobs:
   prepare-build-info:
+    if: ${{ inputs.channel == 'internal' }}
     runs-on: ubuntu-latest
     outputs:
       APP_VERSION_NAME: ${{ steps.get_version_name.outputs.APP_VERSION_NAME }}
@@ -91,6 +92,14 @@ jobs:
     needs: prepare-build-info
     environment: Release
     steps:
+      - name: Check if build is required
+        id: check_build
+        run: |
+            if [[ "${{ inputs.channel }}" == "internal" ]]; then
+             echo "should_build=true" >> $GITHUB_OUTPUT
+            else
+              echo "should_build=false" >> $GITHUB_OUTPUT
+            fi
       - name: Checkout code
         uses: actions/checkout@v5
         with:
@@ -98,11 +107,13 @@ jobs:
           fetch-depth: 0
           submodules: 'recursive'
       - name: Set up JDK 21
+        if: steps.check_build.outputs.should_build == 'true'
         uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'jetbrains'
       - name: Setup Gradle
+        if: steps.check_build.outputs.should_build == 'true'
         uses: gradle/actions/setup-gradle@v5
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
@@ -156,6 +167,7 @@ jobs:
         run: bundle exec fastlane ${{ steps.fastlane_lane.outputs.lane }}
 
       - name: Upload Google AAB artifact
+        if: steps.check_build.outputs.should_build == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: google-aab
@@ -163,6 +175,7 @@ jobs:
           retention-days: 1
 
       - name: Upload Google APK artifact
+        if: steps.check_build.outputs.should_build == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: google-apk
@@ -170,6 +183,7 @@ jobs:
           retention-days: 1
 
       - name: Attest Google artifacts provenance
+        if: steps.check_build.outputs.should_build == 'true'
         uses: actions/attest-build-provenance@v3
         with:
           subject-path: |
@@ -177,6 +191,7 @@ jobs:
             app/build/outputs/apk/google/release/app-google-release.apk
 
   release-fdroid:
+    if: ${{ inputs.channel == 'internal'}}
     runs-on: ubuntu-latest
     needs: prepare-build-info
     environment: Release
@@ -246,13 +261,13 @@ jobs:
       - name: Determine Release Properties
         id: release_properties
         run: |
-          if [[ "${{ inputs.release_type }}" == "internal" ]]; then
+          if [[ "${{ inputs.channel }}" == "internal" ]]; then
             echo "draft=true" >> $GITHUB_OUTPUT
             echo "prerelease=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ inputs.tag_name }}" == *"-closed"* ]]; then
+          elif [[ "${{ inputs.channel }}" == "closed" ]]; then
             echo "draft=false" >> $GITHUB_OUTPUT
             echo "prerelease=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ inputs.tag_name }}" == *"-open"* ]]; then
+          elif [[ "${{ inputs.channel }}" == "open" ]]; then
             echo "draft=false" >> $GITHUB_OUTPUT
             echo "prerelease=true" >> $GITHUB_OUTPUT
           else