try: stabalize build creation

nsrCodes · nsrCodes · commit a458867b2849 · 2025-12-08T00:17:00.000+05:30
diff --git a/.github/workflows/build-orchestrator.yml b/.github/workflows/build-orchestrator.yml
@@ -121,6 +121,7 @@ jobs:
     uses: ./.github/workflows/bump-version.yml
     with:
       version: ${{ needs.prepare.outputs.version }}
+      # Always creates temp branch - will merge to main only if draft release succeeds
 
   build-macos:
     needs: [prepare, bump-version]
@@ -134,7 +135,7 @@ jobs:
       platform: macos-latest
       build_variant: ${{ needs.prepare.outputs.build_variant }}
       custom_url: ${{ inputs.custom_url }}
-      git_ref: ${{ needs.bump-version.outputs.version_tag || github.ref }}
+      git_ref: ${{ needs.bump-version.outputs.branch_name || github.ref }}
 
   build-windows:
     needs: [prepare, bump-version]
@@ -148,7 +149,7 @@ jobs:
       platform: windows-latest
       build_variant: ${{ needs.prepare.outputs.build_variant }}
       custom_url: ${{ inputs.custom_url }}
-      git_ref: ${{ needs.bump-version.outputs.version_tag || github.ref }}
+      git_ref: ${{ needs.bump-version.outputs.branch_name || github.ref }}
 
   build-linux:
     needs: [prepare, bump-version]
@@ -162,7 +163,7 @@ jobs:
       platform: ubuntu-latest
       build_variant: ${{ needs.prepare.outputs.build_variant }}
       custom_url: ${{ inputs.custom_url }}
-      git_ref: ${{ needs.bump-version.outputs.version_tag || github.ref }}
+      git_ref: ${{ needs.bump-version.outputs.branch_name || github.ref }}
       checkout_branch: ''  # Use git_ref instead - will fall back to current branch
 
   build-setapp:
@@ -175,7 +176,7 @@ jobs:
     uses: ./.github/workflows/build-setapp.yml
     secrets: inherit
     with:
-      git_ref: ${{ needs.bump-version.outputs.version_tag || github.ref }}  # Use current branch instead of hardcoding
+      git_ref: ${{ needs.bump-version.outputs.branch_name || github.ref }}
 
   create-draft:
     needs: [prepare, build-macos, build-windows, build-linux]
@@ -192,8 +193,65 @@ jobs:
       version_tag: ${{ needs.prepare.outputs.version_tag }}
       artifact_names: 'macos-build,windows-build,linux-build'
 
+  merge-to-main:
+    needs: [prepare, bump-version, create-draft]
+    if: |
+      always() &&
+      needs.create-draft.result == 'success' &&
+      needs.bump-version.result == 'success'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref_name }}
+          fetch-depth: 0
+
+      - name: Merge temporary branch to main
+        run: |
+          TEMP_BRANCH="${{ needs.bump-version.outputs.branch_name }}"
+          TARGET_BRANCH="${{ github.ref_name }}"
+
+          echo "📦 Merging $TEMP_BRANCH → $TARGET_BRANCH"
+
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          # Fetch the temp branch
+          git fetch origin "$TEMP_BRANCH"
+
+          # Merge temp branch (fast-forward, should be clean)
+          git merge --ff-only "origin/$TEMP_BRANCH" -m "Merge version bump v${{ needs.prepare.outputs.version }}
+
+          Draft release created successfully.
+          Temporary branch: $TEMP_BRANCH
+
+          🤖 Generated by GitHub Actions
+          Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+
+          # Push to main
+          git push origin "HEAD:$TARGET_BRANCH"
+
+          echo "✅ Merged $TEMP_BRANCH → $TARGET_BRANCH"
+
+      - name: Delete temporary branch
+        run: |
+          TEMP_BRANCH="${{ needs.bump-version.outputs.branch_name }}"
+          echo "🗑️  Deleting temporary branch: $TEMP_BRANCH"
+          git push origin --delete "$TEMP_BRANCH"
+          echo "✅ Deleted: $TEMP_BRANCH"
+
+      - name: Summary
+        run: |
+          echo "### ✅ Version Merged to Main" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version**: v${{ needs.prepare.outputs.version }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Target Branch**: ${{ github.ref_name }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Temporary Branch**: ${{ needs.bump-version.outputs.branch_name }} (deleted)" >> $GITHUB_STEP_SUMMARY
+
   summary:
-    needs: [prepare, build-macos, build-windows, build-linux, build-setapp, create-draft]
+    needs: [prepare, build-macos, build-windows, build-linux, build-setapp, create-draft, merge-to-main]
     if: always()
     runs-on: ubuntu-latest
     steps:
@@ -217,6 +275,12 @@ jobs:
           echo "" >> $GITHUB_STEP_SUMMARY
           if [ "${{ needs.create-draft.result }}" == "success" ]; then
             echo "**🎉 Draft Release**: [View Releases](https://github.com/${{ github.repository }}/releases)" >> $GITHUB_STEP_SUMMARY
+            echo "**✅ Version**: Merged to ${{ github.ref_name }}" >> $GITHUB_STEP_SUMMARY
           else
             echo "**📥 Artifacts**: [Download from Run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> $GITHUB_STEP_SUMMARY
+            if [ "${{ needs.bump-version.result }}" == "success" ]; then
+              echo "**⚠️  Temporary Branch**: \`${{ needs.bump-version.outputs.branch_name }}\` (not merged to main)" >> $GITHUB_STEP_SUMMARY
+              echo "" >> $GITHUB_STEP_SUMMARY
+              echo "_Temp branch will remain until manually cleaned up_" >> $GITHUB_STEP_SUMMARY
+            fi
           fi
diff --git a/.github/workflows/build-setapp.yml b/.github/workflows/build-setapp.yml
@@ -31,6 +31,16 @@ jobs:
         with:
           ref: ${{ inputs.git_ref || github.ref }}  # Fall back to current branch if not specified
 
+      - name: Setup Python for node-gyp
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install setuptools for node-gyp
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install setuptools
+
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
@@ -55,12 +65,13 @@ jobs:
         run: bash .erb/scripts/setapp-post-process.sh
 
       - name: Upload artifact
+        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: setapp-build
           path: release/build-setapp/Requestly-Setapp-*.zip
           retention-days: 30
-          if-no-files-found: error
+          if-no-files-found: warn
 
       - name: Summary
         run: |
diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
@@ -17,13 +17,18 @@ on:
         description: 'Git tag created'
         value: ${{ jobs.bump.outputs.tag }}
 
+      branch_name:
+        description: 'Temporary branch name where version was committed'
+        value: ${{ jobs.bump.outputs.branch_name }}
+
 jobs:
   bump:
     runs-on: ubuntu-latest
 
     outputs:
       version: ${{ steps.bump.outputs.version }}
       tag: ${{ steps.bump.outputs.tag }}
+      branch_name: ${{ steps.commit.outputs.branch_name }}
 
     steps:
       - name: Checkout repository
@@ -44,28 +49,44 @@ jobs:
           echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
           echo "tag=v${{ inputs.version }}" >> $GITHUB_OUTPUT
 
-      - name: Commit and push changes
+      - name: Create temporary branch and commit
+        id: commit
         run: |
+          # Always create temporary branch - will merge to main only if draft release succeeds
+          TEMP_BRANCH="tmp-version-${{ inputs.version }}"
+          echo "📦 Creating temporary branch: $TEMP_BRANCH"
+
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git checkout -b "$TEMP_BRANCH"
           git add package.json release/app/package.json
           git commit -m "chore: bump version to v${{ inputs.version }}
 
+          ⚠️  TEMPORARY BRANCH - builds will use this
+          Will merge to main only if draft release succeeds.
+
           🤖 Generated by GitHub Actions
           Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
 
           git tag -a "v${{ inputs.version }}" \
             -m "Release v${{ inputs.version }}" \
+            -m "Branch: $TEMP_BRANCH (temporary)" \
             -m "Workflow: ${{ github.workflow }}" \
             -m "Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
 
-          git push origin HEAD:${{ github.ref_name }}
+          git push origin "$TEMP_BRANCH"
           git push origin "v${{ inputs.version }}"
 
+          echo "branch_name=$TEMP_BRANCH" >> $GITHUB_OUTPUT
+          echo "✅ Temporary branch created: $TEMP_BRANCH"
+
       - name: Summary
         run: |
-          echo "### ✅ Version Bumped" >> $GITHUB_STEP_SUMMARY
+          echo "### ✅ Version Bumped (Temporary Branch)" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "- **Version**: v${{ inputs.version }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Branch**: ${{ steps.commit.outputs.branch_name }}" >> $GITHUB_STEP_SUMMARY
           echo "- **Commit**: $(git rev-parse HEAD)" >> $GITHUB_STEP_SUMMARY
           echo "- **Tag**: v${{ inputs.version }}" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "⚠️  **Note**: Temporary branch - will merge to main if draft release succeeds" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/release_desktop_app.yml b/.github/workflows/release_desktop_app.yml
@@ -79,6 +79,18 @@ jobs:
         with:
           ref: ${{ inputs.checkout_branch || inputs.git_ref || github.ref }}
 
+      - name: Setup Python for node-gyp (macOS only)
+        if: ${{ (inputs.platform || github.event.inputs.build_type) == 'macos-latest' }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Install setuptools for node-gyp (macOS only)
+        if: ${{ (inputs.platform || github.event.inputs.build_type) == 'macos-latest' }}
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install setuptools
+
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v4
         with:
@@ -102,6 +114,43 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
 
+      - name: List build outputs
+        if: always()
+        run: |
+          echo "Build outputs:"
+          ls -lh release/build/ || echo "No build directory found"
+
+      - name: Upload macOS artifacts
+        if: always() && (inputs.platform || github.event.inputs.build_type) == 'macos-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-build
+          path: |
+            release/build/*.dmg
+            release/build/*.zip
+          retention-days: 30
+          if-no-files-found: warn
+
+      - name: Upload Windows artifacts
+        if: always() && (inputs.platform || github.event.inputs.build_type) == 'windows-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-build
+          path: |
+            release/build/*.exe
+          retention-days: 30
+          if-no-files-found: warn
+
+      - name: Upload Linux artifacts
+        if: always() && (inputs.platform || github.event.inputs.build_type) == 'ubuntu-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-build
+          path: |
+            release/build/*.AppImage
+          retention-days: 30
+          if-no-files-found: warn
+
       - name: Set artifact output
         id: output
         run: |
