wip

Author: Kim-the-Diamond

.github/workflows/split.yml

@@ -9,14 +9,6 @@ on:
       packages: 
         description: "Packages to deploy (JSON object with package info)"
         required: true
-      user_name:
-        description: "User name for commits and releases"
-        required: false
-        default: ""
-      user_email:
-        description: "User email for commits and releases"
-        required: false
-        default: ""
       user_token:
         description: "User's GitHub token (for release authorship)"
         required: false
@@ -31,6 +23,7 @@ jobs:
     outputs:
       package-list: ${{ steps.parse.outputs.package-list }}
       core-version: ${{ steps.parse.outputs.core-version }}
+      is-prerelease: ${{ steps.parse.outputs.is-prerelease }}
     steps:
       - name: Parse packages
         id: parse
@@ -43,7 +36,12 @@ jobs:
           echo "Raw packages file:"
           cat packages.json
           
-          # Check if this is a prerelease version
+          # Validate JSON
+          if ! jq empty packages.json 2>/dev/null; then
+            echo "❌ Invalid JSON in 'packages' input"
+            exit 1
+          fi
+
           VERSION="${{ github.event.inputs.version }}"
           if [[ $VERSION =~ -(alpha|beta|rc) ]]; then
             echo "🚧 Detected prerelease version: $VERSION"
@@ -56,11 +54,8 @@ jobs:
           echo "Parsed packages:"
           jq -r 'to_entries[] | "\(.key): Messages=[\(.value["release-message"] | join(", "))] Stability=\(.value["minimum-stability"] // "unknown")"' packages.json
           
-          # Create package list for matrix
           package_list=$(jq -r 'keys | @json' packages.json)
           echo "package-list=$package_list" >> $GITHUB_OUTPUT
-          
-          # Set core version from input (exact version)
           echo "core-version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
           echo "is-prerelease=$IS_PRERELEASE" >> $GITHUB_OUTPUT
           
@@ -85,11 +80,9 @@ jobs:
         run: |
           if [ -f composer.json ]; then
             echo "Updating moox/core version in ${{ matrix.package }} to ${{ needs.prepare.outputs.core-version }}"
-            # Replace any existing moox/core version with the current version
             sed -i 's/"moox\/core": "[^"]*"/"moox\/core": "${{ needs.prepare.outputs.core-version }}"/g' composer.json
-            
             echo "Updated composer.json:"
-            cat composer.json | grep "moox/core" || echo "No moox/core dependency found"
+            grep "moox/core" composer.json || echo "No moox/core dependency found"
           else
             echo "No composer.json found in ${{ matrix.package }}"
           fi
@@ -98,50 +91,46 @@ jobs:
         working-directory: packages/${{ matrix.package }}
         run: |
           if [ -f composer.json ]; then
-            USER_NAME="${{ github.event.inputs.user_name || github.actor }}"
-            USER_EMAIL="${{ github.event.inputs.user_email || format('{0}@users.noreply.github.com', github.actor) }}"
-            git config --global user.name "$USER_NAME"
-            git config --global user.email "$USER_EMAIL"
+            git config user.name "github-actions"
+            git config user.email "[email protected]"
             git add composer.json
             git commit -m "Update moox/core dependency to ${{ needs.prepare.outputs.core-version }}" || echo "No changes to commit"
           fi
 
       - name: Split package to separate repository
-        uses: "symplify/[email protected]"
+        uses: symplify/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ github.event.inputs.user_token != '' && github.event.inputs.user_token || secrets.BOT }}
         with:
           tag: "${{ github.event.inputs.version }}"
           package_directory: "packages/${{ matrix.package }}"
           repository_organization: "mooxphp"
           repository_name: "${{ matrix.package }}"
-          user_name: "${{ github.event.inputs.user_name || github.actor }}"
-          user_email: "${{ github.event.inputs.user_email || format('{0}@users.noreply.github.com', github.actor) }}"
 
       - name: Create GitHub Release for split package
         run: |
           PACKAGE="${{ matrix.package }}"
           VERSION="${{ github.event.inputs.version }}"
-          RELEASE_BODY=$(echo '${{ github.event.inputs.packages }}' | jq -r ".\"$PACKAGE\".\"release-message\"[]" | head -10 | tr '\n' ' ')
-          IS_PRERELEASE=${{ contains(github.event.inputs.version, 'alpha') || contains(github.event.inputs.version, 'beta') || contains(github.event.inputs.version, 'rc') }}
-          USER_NAME="${{ github.event.inputs.user_name || github.actor }}"
-          
-          # Use user token if provided, otherwise use bot token
-          if [ -n "${{ github.event.inputs.user_token }}" ]; then
-            RELEASE_TOKEN="${{ github.event.inputs.user_token }}"
-            echo "Creating release as user: $USER_NAME"
+          RELEASE_BODY=$(echo '${{ github.event.inputs.packages }}' | jq -r ".\"$PACKAGE\".\"release-message\" // [] | .[:10] | join(\"\\n\")")
+
+          echo "Creating release for $PACKAGE $VERSION"
+          echo "Release notes:"
+          echo "$RELEASE_BODY"
+
+          # Wait for tag propagation
+          sleep 10
+
+          if [ "${{ needs.prepare.outputs.is-prerelease }}" = "true" ]; then
+            gh release create "$VERSION" \
+              --repo "mooxphp/$PACKAGE" \
+              --title "Release $VERSION" \
+              --notes "$RELEASE_BODY" \
+              --prerelease
           else
-            RELEASE_TOKEN="${{ secrets.TOKEN }}"
-            echo "Creating release as bot (no user token provided)"
-            RELEASE_BODY="$RELEASE_BODY - Released by: $USER_NAME"
+            gh release create "$VERSION" \
+              --repo "mooxphp/$PACKAGE" \
+              --title "Release $VERSION" \
+              --notes "$RELEASE_BODY"
           fi
-          
-          # Wait a moment for tag to be available
-          sleep 10
-          
-          # Create release from existing tag using GitHub CLI
-          gh release create "$VERSION" \
-            --repo "mooxphp/$PACKAGE" \
-            --title "Release $VERSION" \
-            --notes "$RELEASE_BODY" \
-            $([ "$IS_PRERELEASE" = "true" ] && echo "--prerelease" || echo "")
         env:
-          GH_TOKEN: ${{ github.event.inputs.user_token || secrets.TOKEN }}
+          GH_TOKEN: ${{ github.event.inputs.user_token != '' && github.event.inputs.user_token || secrets.TOKEN }}

packages/monorepo/src/Commands/CreateRelease.php

@@ -119,9 +119,6 @@ public function handle(): int
         $newVersion = $this->askForNewVersion($currentVersion);
         $this->info("New version: {$newVersion}\n");
 
-        // Ask for user token for release authorship
-        $userToken = $this->askForUserToken();
-
         $missingPackagesResult = $this->packageComparisonService->isNewOrgPackage(array_keys($packages['public']), array_keys($packages['private']), $orgPackages);
 
         // Flatten the missing packages result into a single array
@@ -190,7 +187,7 @@ public function handle(): int
                 [
                     'version' => $newVersion,
                     'packages' => $publicPackagesJson,
-                    'user_token' => $userToken,
+                    'user_token' => $this->getGitHubToken(),
                 ]
             );
         }
@@ -207,7 +204,7 @@ public function handle(): int
                 [
                     'version' => $newVersion,
                     'packages' => $privatePackagesJson,
-                    'user_token' => $userToken,
+                    'user_token' => $this->getGitHubToken(),
                 ]
             );
         }
@@ -398,26 +395,6 @@ public function askForNewVersion(string $currentVersion): string
         return $version;
     }
 
-    public function askForUserToken(): string
-    {
-        $this->line("\n🔑 GitHub Release Authorship");
-        $this->line('To appear as the author of GitHub releases, provide your personal access token.');
-        $this->line('Leave empty to use bot token (releases will show as created by mooxbot).');
-        $this->line("Token needs 'public_repo' or 'repo' scope for the target repositories.");
-
-        $token = $this->secret('Enter your GitHub personal access token (optional):');
-
-        if (empty($token)) {
-            $this->line('ℹ️  Using bot token - releases will be created by mooxbot');
-
-            return '';
-        } else {
-            $this->line('✅ Using your token - releases will show you as author');
-
-            return $token;
-        }
-    }
-
     // Helper methods
     private function validateVersionFormat(string $version): bool
     {