use reusable workflows in create-release-prs.yml

Author: nan-li

.github/workflows/create-release-prs.yml

@@ -24,13 +24,24 @@ permissions:
   pull-requests: write
 
 jobs:
-  bump-version:
+  # Step 1: Use reusable workflow to prepare release branch
+  prep:
+    uses: OneSignal/sdk-actions/.github/workflows/prep-release.yml@main
+    with:
+      version: ${{ github.event.inputs.version }}
+
+  # Step 2: Update iOS-specific files and build binaries
+  update-and-build:
+    needs: prep
     runs-on: macos-13
 
+    outputs:
+      version_from: ${{ steps.extract_version.outputs.current_version }}
+
     env:
       VERSION: ${{ github.event.inputs.version }}
       BASE_BRANCH: ${{ github.event.inputs.base_branch }}
-      RELEASE_BRANCH: rel/${{ github.event.inputs.version }}
+      RELEASE_BRANCH: ${{ needs.prep.outputs.release_branch }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
@@ -39,28 +50,27 @@ jobs:
           echo "============================================"
           echo "📦 Release Version: $VERSION"
           echo "🎯 Base Branch (PR Target): $BASE_BRANCH"
-          echo "🌿 Release Branch (to create): $RELEASE_BRANCH"
+          echo "🌿 Release Branch: $RELEASE_BRANCH"
           echo "============================================"
 
       - name: Checkout OneSignal-iOS-SDK
         uses: actions/checkout@v4
         with:
-          ref: ${{ env.BASE_BRANCH }}
+          ref: ${{ needs.prep.outputs.release_branch }}
           fetch-depth: 0
 
-      - name: Create Release Branch
+      - name: Configure Git
         run: |
-          # Delete remote branch if it exists
-          git push origin --delete $RELEASE_BRANCH || true
-
-          # Create and checkout new release branch
-          git checkout -b $RELEASE_BRANCH
-          echo "Created release branch: $RELEASE_BRANCH"
-
-          # Configure git user (only needed once per repo)
           git config --local user.email "noreply@onesignal.com"
           git config --local user.name "github-actions[bot]"
 
+      - name: Extract Current Version
+        id: extract_version
+        run: |
+          CURRENT_VERSION=$(grep -E "s.version\s*=" OneSignal.podspec | sed -E 's/.*"(.*)".*/\1/')
+          echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          echo "Current version: $CURRENT_VERSION"
+
       - name: Setup Xcode
         uses: maxim-lobanov/setup-xcode@v1
         with:
@@ -133,97 +143,50 @@ jobs:
           git commit -am "chore: update Swift package"
           git push origin $RELEASE_BRANCH
 
-      - name: Fetch Last GitHub Release Tag
-        id: fetch_last_release
-        run: |
-          echo "Fetching latest GitHub release tag..."
-          LAST_TAG=$(gh release list --limit 1 --json tagName --jq '.[0].tagName')
+  # Step 3: Use reusable workflow to create iOS SDK PR with release notes
+  create-ios-pr:
+    needs: [prep, update-and-build]
+    uses: OneSignal/sdk-actions/.github/workflows/create-release.yml@main
+    with:
+      release_branch: ${{ needs.prep.outputs.release_branch }}
+      version_from: ${{ needs.update-and-build.outputs.version_from }}
+      version_to: ${{ github.event.inputs.version }}
+
+  # Step 4: Update XCFramework repository
+  update-xcframework:
+    needs: [prep, update-and-build, create-ios-pr]
+    runs-on: macos-13
 
-          if [[ -z "$LAST_TAG" ]]; then
-            echo "❌ No previous release tag found. Cannot generate release notes."
-            exit 0
-          fi
+    env:
+      VERSION: ${{ github.event.inputs.version }}
+      BASE_BRANCH: ${{ github.event.inputs.base_branch }}
+      RELEASE_BRANCH: ${{ needs.prep.outputs.release_branch }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-          echo "✅ Found last release tag: $LAST_TAG"
-          echo "range=$LAST_TAG..HEAD" >> $GITHUB_OUTPUT
+    steps:
+      - name: Checkout OneSignal-iOS-SDK
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.prep.outputs.release_branch }}
+          path: ios-sdk-repo
 
-      - name: Generate Release Notes from PR Titles
+      - name: Get iOS SDK PR Body
         run: |
-          echo "## 🔖 Auto-Generated Release Notes" > pr_body.md
-          echo "" >> pr_body.md
-
-          if [[ "$VERSION" == *"alpha"* ]]; then
-            CHANNEL="alpha"
-          elif [[ "$VERSION" == *"beta"* ]]; then
-            CHANNEL="beta"
-          else
-            CHANNEL="current"
-          fi
-
-          echo "**Channels:** $CHANNEL" >> pr_body.md
-          echo "" >> pr_body.md
+          cd ios-sdk-repo
 
-          RANGE="${{ steps.fetch_last_release.outputs.range }}"
-          echo "📦 Commit range: $RANGE"
+          # Find the PR that was just created for this version
+          PR_NUMBER=$(gh pr list --state open --search "Release $VERSION in:title" --json number --jq '.[0].number // empty')
 
-          COMMITS=$(git log "$RANGE" --pretty=format:"%H" | sort -u)
-
-          if [[ -z "$COMMITS" ]]; then
-            echo "❌ No commits found. Exiting."
-            exit 0
-          fi
-
-          > raw_titles.txt
-          for SHA in $COMMITS; do
-            PR_INFO=$(gh api "repos/${{ github.repository }}/commits/$SHA/pulls" \
-              -H "Accept: application/vnd.github.groot-preview+json" 2>/dev/null)
-
-            TITLE=$(echo "$PR_INFO" | jq -r '.[0].title // empty')
-            NUMBER=$(echo "$PR_INFO" | jq -r '.[0].number // empty')
-
-            if [[ -n "$TITLE" && -n "$NUMBER" ]]; then
-              echo "$TITLE ([#$NUMBER](https://github.com/${{ github.repository }}/pull/$NUMBER))" >> raw_titles.txt
-              echo "✅ $SHA → $TITLE (#$NUMBER)"
-            else
-              echo "⚠️ $SHA → No PR found"
-            fi
-          done
-
-          sort -fu raw_titles.txt > pr_titles.txt
-
-          if [[ ! -s pr_titles.txt ]]; then
-            echo "❌ No PR titles found from commits. Exiting."
-            exit 0
+          if [[ -n "$PR_NUMBER" ]]; then
+            echo "Found iOS SDK PR: #$PR_NUMBER"
+            gh pr view "$PR_NUMBER" --json body --jq '.body' > ../pr_body.md
+          else
+            echo "Warning: Could not find iOS SDK PR, using default body"
+            echo "## Release $VERSION" > ../pr_body.md
+            echo "" >> ../pr_body.md
+            echo "See iOS SDK release: https://github.com/OneSignal/OneSignal-iOS-SDK/releases/tag/$VERSION" >> ../pr_body.md
           fi
 
-          echo "" >> pr_body.md
-          echo "### 🚀 New Features" >> pr_body.md
-          grep -i '^feat' pr_titles.txt | sed 's/^/- /' >> pr_body.md || echo "- _None_" >> pr_body.md
-
-          echo "" >> pr_body.md
-          echo "### 🐛 Bug Fixes" >> pr_body.md
-          grep -i '^bug' pr_titles.txt | sed 's/^/- /' >> pr_body.md || echo "- _None_" >> pr_body.md
-
-          echo "" >> pr_body.md
-          echo "### 🔧 Improvements" >> pr_body.md
-          grep -i -E '^(perf|refactor)' pr_titles.txt | sed 's/^/- /' >> pr_body.md || echo "- _None_" >> pr_body.md
-
-          echo "" >> pr_body.md
-          echo "### 📝 Uncategorized PRs" >> pr_body.md
-          grep -v -i -E '^(feat|bug|perf|refactor)' pr_titles.txt | sed 's/^/- /' >> pr_body.md || echo "- _None_" >> pr_body.md
-
-          echo "" >> pr_body.md
-          echo "### 📦 Version" >> pr_body.md
-          echo "$VERSION" >> pr_body.md
-
-      - name: Create Pull Request for iOS SDK
-        run: |
-          gh pr create \
-            --title "Release $VERSION" \
-            --body-file pr_body.md \
-            --head "$RELEASE_BRANCH" \
-            --base "$BASE_BRANCH"
-
       - name: Checkout OneSignal-XCFramework
         uses: actions/checkout@v4
         with:
@@ -235,7 +198,7 @@ jobs:
       - name: Update Package.swift in XCFramework Repository
         run: |
           # Copy Package.swift from iOS SDK to XCFramework repo
-          cp Package.swift xcframework-repo/Package.swift
+          cp ios-sdk-repo/Package.swift xcframework-repo/Package.swift
 
           # Navigate to XCFramework repo
           cd xcframework-repo
@@ -255,13 +218,15 @@ jobs:
 
           # Push to remote
           git push origin $RELEASE_BRANCH
+        env:
+          GH_TOKEN: ${{ secrets.PAT_TOKEN_ONESIGNAL_XCFRAMEWORK }}
 
       - name: Create Pull Request for XCFramework Repository
         env:
           GH_TOKEN: ${{ secrets.PAT_TOKEN_ONESIGNAL_XCFRAMEWORK }}
-
         run: |
           cd xcframework-repo
+
           gh pr create \
             --title "Release $VERSION" \
             --body-file ../pr_body.md \