ci: deploy workflow

Author: hyochan

.github/workflows/deploy-cocoapods.yml

@@ -1,8 +1,6 @@
 name: Deploy to CocoaPods
 
 on:
-  release:
-    types: [published]
   workflow_dispatch:
 
 jobs:
@@ -31,9 +29,12 @@ jobs:
         pod lib lint openiap.podspec --allow-warnings
     
     - name: Deploy to CocoaPods Trunk
-      if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
       env:
         COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
         COCOAPODS_VALIDATOR_SKIP_XCODEBUILD: 1
       run: |
-        pod trunk push openiap.podspec --allow-warnings
+        if [ -z "$COCOAPODS_TRUNK_TOKEN" ]; then
+          echo "COCOAPODS_TRUNK_TOKEN is not set. Skipping CocoaPods publish.";
+          exit 0;
+        fi
+        pod trunk push openiap.podspec --allow-warnings

.github/workflows/deploy-swift.yml

@@ -1,47 +1,94 @@
-name: Deploy Swift Package
+name: Release Swift Package
 
 on:
-  release:
-    types: [published]
   workflow_dispatch:
+    inputs:
+      version:
+        description: "Version to release (e.g., 1.2.3 or major/minor/patch)"
+        required: true
+        type: string
+
+permissions:
+  contents: write
 
 jobs:
-  deploy:
+  release:
     runs-on: macos-latest
-    
+
     steps:
-    - uses: actions/checkout@v3
-    
-    - name: Select Xcode
-      run: |
-        sudo xcode-select -s /Applications/Xcode.app
-    
-    - name: Build Package
-      run: swift build
-    
-    - name: Run Tests
-      run: swift test
-    
-    - name: Create git tag if not exists
-      if: github.event_name == 'workflow_dispatch'
-      run: |
-        VERSION=$(cat VERSION)
-        git config user.name hyodotdev
-        git config user.email hyo@hyo.dev
-        
-        # Check if tag exists on remote
-        if git ls-remote --tags origin | grep -q "refs/tags/$VERSION"; then
-          echo "Tag $VERSION already exists on remote, skipping..."
-        else
-          # Create tag locally if not exists
-          if ! git rev-parse "refs/tags/$VERSION" >/dev/null 2>&1; then
-            git tag $VERSION
+      - uses: actions/checkout@v4
+
+      - name: Select Xcode
+        run: sudo xcode-select -s /Applications/Xcode.app
+
+      - name: Determine version
+        id: set_version
+        shell: bash
+        run: |
+          VERSION="${{ github.event.inputs.version }}"
+          # Trim possible leading 'v'
+          VERSION="${VERSION#v}"
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "Release version: $VERSION"
+
+      - name: Configure Git
+        run: |
+          git config user.name "hyodotdev"
+          git config user.email "hyo@hyo.dev"
+
+      - name: Bump version and tag
+        run: |
+          ./scripts/bump-version.sh "${{ env.VERSION }}"
+          # Refresh VERSION to the computed value (handles major/minor/patch)
+          NEW_VERSION=$(cat VERSION)
+          echo "VERSION=$NEW_VERSION" >> $GITHUB_ENV
+          echo "Computed version: $NEW_VERSION"
+
+      - name: Build Package
+        run: swift build
+
+      - name: Run Tests
+        run: swift test
+
+      - name: Verify Package
+        run: |
+          swift package show-dependencies
+          swift package describe
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ env.VERSION }}
+          name: ${{ env.VERSION }}
+          draft: false
+          prerelease: false
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+
+      - name: Install CocoaPods
+        run: |
+          gem list -i cocoapods || gem install cocoapods --no-document
+
+      - name: Validate Podspec
+        env:
+          COCOAPODS_VALIDATOR_SKIP_XCODEBUILD: 1
+        run: |
+          pod lib lint openiap.podspec --allow-warnings
+
+      - name: Publish to CocoaPods Trunk
+        env:
+          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
+          COCOAPODS_VALIDATOR_SKIP_XCODEBUILD: 1
+        run: |
+          if [ -z "$COCOAPODS_TRUNK_TOKEN" ]; then
+            echo "COCOAPODS_TRUNK_TOKEN is not set. Skipping CocoaPods publish.";
+            exit 0;
           fi
-          # Push tag
-          git push origin $VERSION
-        fi
-    
-    - name: Verify Package
-      run: |
-        swift package show-dependencies
-        swift package describe
+          pod trunk push openiap.podspec --allow-warnings

CONTRIBUTING.md

@@ -106,10 +106,17 @@ When your PR is merged, maintainers will handle the release:
    ./scripts/bump-version.sh major  # for breaking changes
    ```
 
-2. **Automatic Deployment**: Creating a GitHub release triggers:
+2. **Deployment Workflows (separated)**
 
-   - Swift Package Manager update (immediate)
-   - CocoaPods deployment (via `pod trunk push`)
+   - Swift Package (SPM):
+     - Actions → "Release Swift Package" → Run workflow → enter version (e.g., `1.2.3` or `patch`).
+     - This bumps version, commits, tags, creates a GitHub Release, and runs build/tests. SPM picks up new versions from git tags automatically.
+
+   - CocoaPods:
+     - Actions → "Deploy to CocoaPods" → Run workflow.
+     - Uses the current `openiap.podspec` version and publishes via `pod trunk push` (requires `COCOAPODS_TRUNK_TOKEN` repository secret).
+
+   - These are decoupled. Run SPM release and CocoaPods deploy independently, or run both sequentially (SPM first, then CocoaPods).
 
 3. **Availability**:
    - Swift Package: Available immediately after release