fix: prevent overwrite during app branch upload (#3227)

Co-authored-by: Marc Nause <marc.nause@audioattack.de>

Author: bhavjsh

.github/workflows/push-event.yml

@@ -39,14 +39,12 @@ jobs:
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          
-          # Get commit message
+
           commit_message=$(git log -1 --pretty=format:"%s")
-          
+
           git clone --branch=version https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} version
           cd version
 
-          # Read and increment version name
           IFS='.' read -r major minor patch < versionName.txt
 
           if [[ "$commit_message" =~ ^feat: ]]; then
@@ -56,18 +54,17 @@ jobs:
             next_minor=$((minor))
             next_patch=$((patch + 1))
           fi
+
           next_version_name="$major.$next_minor.$next_patch"
           echo "VERSION_NAME=$next_version_name" >> $GITHUB_OUTPUT
           echo "$next_version_name" > versionName.txt
 
-          # Read and increment version code
           read -r version_code < versionCode.txt
-          
+
           new_version_code=$((version_code + 1))
           echo "VERSION_CODE=$new_version_code" >> $GITHUB_OUTPUT
           echo "$new_version_code" > versionCode.txt
 
-          # Force push to version branch
           git checkout --orphan temporary
           git add --all .
           git commit -am "[Auto] Update versionName: $next_version_name & versionCode: $new_version_code ($(date +%Y-%m-%d.%H:%M:%S))"
@@ -100,58 +97,17 @@ jobs:
           VERSION_CODE: ${{needs.common.outputs.VERSION_CODE}}
 
       - name: Upload APK
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: APK Generated
           path: build/app/outputs/flutter-apk
 
       - name: Upload AAB Release
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: AAB Generated
           path: build/app/outputs/bundle
 
-      - name: Upload APK/AAB to app branch
-        if: ${{ github.repository == 'fossasia/pslab-app' }}
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-          git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
-          cd app
-          
-          branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-
-          echo "Removing previous files from branch"
-
-          rm -rf pslab-$branch*
-
-          ls
-
-          echo "Copying new build files"
-
-          find ../build/app/outputs/flutter-apk -type f \( -name '*release.apk' -o -name '*release.aab' \) -exec cp -v {} . \;
-          find ../build/app/outputs/bundle -type f \( -name '*release.apk' -o -name '*release.aab' \) -exec cp -v {} . \;
-
-          ls
-
-          echo "Renaming new build files"
-
-          for file in app*; do
-            mv $file pslab-$branch-${file#*-}
-          done
-
-          ls
-
-          echo "Pushing to app branch"
-
-          git checkout --orphan temporary
-          git add --all .
-          git commit -am "[Auto] Update APK/AABs from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
-          git branch -D app
-          git branch -m app
-          git push --force origin app
-
       - name: Update app in Open Testing track
         if: ${{ github.repository == 'fossasia/pslab-app' }}
         run: |
@@ -192,7 +148,7 @@ jobs:
           fastlane setupCertificates
           if [[ $? -ne 0 ]]; then
               exit 1
-          fi    
+          fi
 
       - name: iOS Workflow
         uses: ./.github/actions/ios
@@ -207,67 +163,8 @@ jobs:
           fastlane uploadToBeta
           if [[ $? -ne 0 ]]; then
               exit 1
-          fi        
-
-  update-release:
-    name: Update Draft Release
-    needs: [ common, android, ios, windows, linux, linux-arm64, macos ]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Release Drafter
-        uses: release-drafter/release-drafter@v7
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          version: ${{ needs.common.outputs.VERSION_NAME }}
-
-  screenshots-android:
-    name: Screenshots (Android)
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Android Screenshot Workflow
-        uses: ./.github/actions/screenshot-android
-        with:
-          ANDROID_EMULATOR_API: ${{ env.ANDROID_EMULATOR_API }}
-          ANDROID_EMULATOR_ARCH: ${{ env.ANDROID_EMULATOR_ARCH }}
-
-  screenshots-iphone:
-    name: Screenshots (iPhone)
-    runs-on: macos-latest
-    timeout-minutes: 30
-    steps:
-      - name: Set up Xcode
-        uses: maxim-lobanov/setup-xcode@v1.7.0
-        with:
-          xcode-version: '26.3.0'
-
-      - uses: actions/checkout@v6
-
-      - name: iPhone Screenshot Workflow
-        uses: ./.github/actions/screenshot-iphone
-        with:
-          IPHONE_DEVICE_MODEL: ${{ env.IPHONE_DEVICE_MODEL }}
-  
-  screenshots-ipad:
-    name: Screenshots (iPad)
-    runs-on: macos-latest
-    timeout-minutes: 30
-    steps:
-      - name: Set up Xcode
-        uses: maxim-lobanov/setup-xcode@v1.7.0
-        with:
-          xcode-version: '26.3.0'
-
-      - uses: actions/checkout@v6
+          fi
 
-      - name: iPad Screenshot Workflow
-        uses: ./.github/actions/screenshot-ipad
-        with:
-          IPAD_DEVICE_MODEL: ${{ env.IPAD_DEVICE_MODEL }}
-  
   windows:
     name: Windows Flutter Build
     needs: common
@@ -281,35 +178,12 @@ jobs:
           VERSION_NAME: ${{needs.common.outputs.VERSION_NAME}}
           VERSION_CODE: ${{needs.common.outputs.VERSION_CODE}}
 
-      - name: Upload installer to app branch
-        if: ${{ github.repository == 'fossasia/pslab-app' }}
-        shell: bash
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-          git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
-          cd app
-          
-          branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-
-          echo "Removing previous files from branch"
-
-          rm -rf *.exe
-
-          echo "Copying new build files"
-
-          cp -v ../build/windows/x64/installer/Release/*.exe .
-
-          echo "Pushing to app branch"
+      - name: Upload Windows Installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: Windows Installer
+          path: build/windows/x64/installer/Release/*.exe
 
-          git checkout --orphan temporary
-          git add --all .
-          git commit -am "[Auto] Update Windows Installer from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
-          git branch -D app
-          git branch -m app
-          git push --force origin app
-  
   linux:
     name: Linux Flutter Build
     needs: common
@@ -323,35 +197,13 @@ jobs:
           VERSION_NAME: ${{needs.common.outputs.VERSION_NAME}}
           VERSION_CODE: ${{needs.common.outputs.VERSION_CODE}}
 
-      - name: Upload packages to app branch
-        if: ${{ github.repository == 'fossasia/pslab-app' }}
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-          git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
-          cd app
-          
-          branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-
-          echo "Removing previous files from branch"
-
-          find . -maxdepth 1 -type f -name '*.deb' ! -name '*arm64*' -delete
-          find . -maxdepth 1 -type f -name '*.rpm' ! -name '*aarch64*' -delete
-
-          echo "Copying new build files"
-
-          cp -v ../*.deb .
-          cp -v ../*.rpm .
-
-          echo "Pushing to app branch"
-
-          git checkout --orphan temporary
-          git add --all .
-          git commit -am "[Auto] Update Linux Packages from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
-          git branch -D app
-          git branch -m app
-          git push --force origin app
+      - name: Upload Linux Packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux Packages
+          path: |
+            *.deb
+            *.rpm
 
   linux-arm64:
     name: Linux ARM64 Flutter Build
@@ -366,34 +218,13 @@ jobs:
           VERSION_NAME: ${{needs.common.outputs.VERSION_NAME}}
           VERSION_CODE: ${{needs.common.outputs.VERSION_CODE}}
 
-      - name: Upload packages to app branch
-        if: ${{ github.repository == 'fossasia/pslab-app' }}
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-          git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
-          cd app
-          
-          branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
-
-          echo "Removing previous files from branch"
-
-          rm -rf *arm64*.deb *aarch64*.rpm
-
-          echo "Copying new build files"
-
-          cp -v ../*.deb .
-          cp -v ../*.rpm .
-
-          echo "Pushing to app branch"
-
-          git checkout --orphan temporary
-          git add --all .
-          git commit -am "[Auto] Update Linux ARM64 Packages from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
-          git branch -D app
-          git branch -m app
-          git push --force origin app
+      - name: Upload Linux ARM64 Packages
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux ARM64 Packages
+          path: |
+            *.deb
+            *.rpm
 
   macos:
     name: macOS Flutter Build
@@ -408,30 +239,72 @@ jobs:
           VERSION_NAME: ${{needs.common.outputs.VERSION_NAME}}
           VERSION_CODE: ${{needs.common.outputs.VERSION_CODE}}
 
-      - name: Upload dmg to app branch
-        if: ${{ github.repository == 'fossasia/pslab-app' }}
+      - name: Upload macOS DMG
+        uses: actions/upload-artifact@v4
+        with:
+          name: macOS DMG
+          path: '*.dmg'
+
+  publish-app-branch:
+    name: Publish artifacts to app branch
+    needs: [android, windows, linux, linux-arm64, macos]
+    if: ${{ github.repository == 'fossasia/pslab-app' }}
+    runs-on: ubuntu-latest
+
+    concurrency:
+      group: upload-to-app-branch
+      cancel-in-progress: false
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Publish artifacts to app branch
         run: |
+          set -euo pipefail
+
           git config --global user.name "github-actions[bot]"
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
           git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
+
           cd app
-          
+
           branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
 
-          echo "Removing previous files from branch"
+          echo "Removing old artifacts"
 
-          rm -rf *.dmg
+          find . -maxdepth 1 -type f \( -name '*.apk' -o -name '*.aab' -o -name '*.exe' -o -name '*.deb' -o -name '*.rpm' -o -name '*.dmg' \) -delete
 
-          echo "Copying new build files"
+          echo "Copying new artifacts"
 
-          cp -v ../*.dmg .
+          find ../artifacts -type f \( \
+            -name '*.apk' -o \
+            -name '*.aab' -o \
+            -name '*.exe' -o \
+            -name '*.deb' -o \
+            -name '*.rpm' -o \
+            -name '*.dmg' \
+          \) -exec cp -v {} . \;
 
-          echo "Pushing to app branch"
+          echo "Renaming Android artifacts"
+
+          for file in app*; do
+            [ -e "$file" ] || continue
+            mv "$file" "pslab-$branch-${file#*-}"
+          done
 
           git checkout --orphan temporary
           git add --all .
-          git commit -am "[Auto] Update macOS DMG from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
+
+          git diff --cached --quiet && echo "No changes to commit" && exit 0
+
+          git commit -m "[Auto] Update artifacts from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
+
           git branch -D app
           git branch -m app
           git push --force origin app