fix: reorder release-please jobs and fix enhance-release-pr workflow #15
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -5,6 +5,7 @@ on: | |||||
| types: [opened, synchronize, reopened] | ||||||
| branches: | ||||||
| - main | ||||||
| workflow_dispatch: # Added to allow manual triggering | ||||||
|
|
||||||
| # Cancel in-progress runs when a new commit is pushed to the same PR | ||||||
| concurrency: | ||||||
|
|
@@ -20,20 +21,21 @@ permissions: | |||||
| jobs: | ||||||
| enhance-release-pr: | ||||||
| name: 🤖 Claude AI Enhancement | ||||||
| if: startsWith(github.event.pull_request.head.ref, 'release-please--') | ||||||
| runs-on: ubuntu-latest | ||||||
| steps: | ||||||
| - name: 📥 Checkout PR Branch | ||||||
| uses: actions/checkout@v5 | ||||||
| with: | ||||||
| ref: ${{ github.event.pull_request.head.ref }} | ||||||
| fetch-depth: 0 | ||||||
| token: ${{ secrets.GITHUB_TOKEN }} | ||||||
|
|
||||||
| - name: 🏷️ Extract Version from PR Title | ||||||
| id: version | ||||||
| run: | | ||||||
| # Extract version using sed -E (extended regex, more portable than grep -P) | ||||||
| VERSION=$(echo "${{ github.event.pull_request.title }}" | sed -E 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/' || echo "") | ||||||
|
Comment on lines
34
to
+38
There was a problem hiding this comment.
The new sed-based extraction returns the original PR title when no Useful? React with 👍 / 👎. There was a problem hiding this comment. The sed pattern replacement may not work as intended. Unlike
Suggested change
|
||||||
| if [ -z "$VERSION" ]; then | ||||||
| echo "⚠️ Could not extract version from PR title" | ||||||
| echo "skip=true" >> $GITHUB_OUTPUT | ||||||
|
|
@@ -46,8 +48,68 @@ jobs: | |||||
| - name: ⬅️ Get Previous Version | ||||||
| id: prev_version | ||||||
| if: steps.version.outputs.skip != 'true' | ||||||
| env: | ||||||
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||||||
| run: | | ||||||
| echo "🔍 Determining previous version..." | ||||||
|
|
||||||
| # Method 1: Try to get from base branch's manifest (most reliable) | ||||||
| # Uses GitHub API to read .release-please-manifest.json from the base branch | ||||||
| echo "📋 Checking base branch (${{ github.event.pull_request.base.ref }}) manifest..." | ||||||
| BASE_MANIFEST=$(gh api repos/${{ github.repository }}/contents/.release-please-manifest.json?ref=${{ github.event.pull_request.base.ref }} 2>/dev/null | jq -r '.content' | base64 -d 2>/dev/null || echo "") | ||||||
| if [ -n "$BASE_MANIFEST" ]; then | ||||||
| PREV=$(echo "$BASE_MANIFEST" | jq -r '."."' 2>/dev/null || echo "") | ||||||
| if [ -n "$PREV" ] && [ "$PREV" != "null" ] && [ "$PREV" != "0.0.0" ]; then | ||||||
| echo "✅ Found version from base branch manifest: $PREV" | ||||||
| echo "prev_version=$PREV" >> $GITHUB_OUTPUT | ||||||
| echo "📦 Previous version: $PREV" | ||||||
| exit 0 | ||||||
| fi | ||||||
| fi | ||||||
|
|
||||||
| # Method 2: Get latest GitHub release tag | ||||||
| echo "🏷️ Checking GitHub releases..." | ||||||
| LATEST_RELEASE=$(gh api repos/${{ github.repository }}/releases/latest 2>/dev/null | jq -r '.tag_name' | sed 's/^v//' || echo "") | ||||||
| if [ -n "$LATEST_RELEASE" ] && [ "$LATEST_RELEASE" != "null" ]; then | ||||||
| echo "✅ Found version from GitHub releases: $LATEST_RELEASE" | ||||||
| echo "prev_version=$LATEST_RELEASE" >> $GITHUB_OUTPUT | ||||||
| echo "📦 Previous version: $LATEST_RELEASE" | ||||||
| exit 0 | ||||||
| fi | ||||||
|
|
||||||
| # Method 3: Get latest tag (even if no release exists) | ||||||
| echo "🏷️ Checking Git tags..." | ||||||
| # Use sed instead of grep -oP for portability (BSD grep doesn't support -P) | ||||||
| LATEST_TAG=$(git ls-remote --tags origin | sed -nE 's|.*refs/tags/v([0-9]+\.[0-9]+\.[0-9]+).*|\1|p' | sort -V | tail -1 || echo "") | ||||||
| if [ -n "$LATEST_TAG" ]; then | ||||||
| echo "✅ Found version from Git tags: $LATEST_TAG" | ||||||
| echo "prev_version=$LATEST_TAG" >> $GITHUB_OUTPUT | ||||||
| echo "📦 Previous version: $LATEST_TAG" | ||||||
| exit 0 | ||||||
| fi | ||||||
|
|
||||||
| # Method 4: Fallback to PR branch manifest (might have new version, but better than 0.0.0) | ||||||
| echo "📋 Checking PR branch manifest (fallback)..." | ||||||
| PREV=$(jq -r '."."' .release-please-manifest.json 2>/dev/null || echo "0.0.0") | ||||||
| if [ "$PREV" = "null" ] || [ -z "$PREV" ]; then | ||||||
| PREV="0.0.0" | ||||||
| fi | ||||||
|
|
||||||
| # If we got the same version as proposed, try to decrement patch version | ||||||
| if [ "$PREV" = "${{ steps.version.outputs.version }}" ]; then | ||||||
| echo "⚠️ PR branch has same version as proposed, attempting to infer previous..." | ||||||
| # Try to get from git log or fallback to decrementing patch | ||||||
| MAJOR=$(echo "$PREV" | cut -d. -f1) | ||||||
| MINOR=$(echo "$PREV" | cut -d. -f2) | ||||||
| PATCH=$(echo "$PREV" | cut -d. -f3) | ||||||
| if [ "$PATCH" -gt 0 ]; then | ||||||
| PREV="$MAJOR.$MINOR.$((PATCH - 1))" | ||||||
| echo "📉 Decremented patch version: $PREV" | ||||||
| else | ||||||
| PREV="0.0.0" | ||||||
| fi | ||||||
| fi | ||||||
|
|
||||||
| echo "prev_version=$PREV" >> $GITHUB_OUTPUT | ||||||
| echo "📦 Previous version: $PREV" | ||||||
|
|
||||||
|
|
@@ -80,7 +142,7 @@ jobs: | |||||
| REPO: ${{ github.repository }} | ||||||
| PROPOSED_VERSION: ${{ steps.version.outputs.version }} | ||||||
| PREVIOUS_VERSION: ${{ steps.prev_version.outputs.prev_version }} | ||||||
| PR_BRANCH: ${{ github.event.pull_request.head.ref }} | ||||||
| PR_NUMBER: ${{ github.event.pull_request.number }} | ||||||
|
|
||||||
| # 🤖 CLAUDE CODE: RELEASE MANAGER FOR open-runtime/grpc-dart | ||||||
|
|
@@ -254,7 +316,7 @@ jobs: | |||||
|
|
||||||
| 3. **Push All Changes:** | ||||||
| ```bash | ||||||
| git push origin ${{ github.event.pull_request.head.ref }} | ||||||
| ``` | ||||||
|
|
||||||
| 4. **Be Conservative** - this is a critical infrastructure package | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -32,54 +32,19 @@ permissions: | |||||||
| actions: write | ||||||||
|
|
||||||||
| jobs: | ||||||||
| # ============================================================================= | ||||||||
| # Step 1: Handle Untagged Merged Release PRs FIRST | ||||||||
| # ============================================================================= | ||||||||
| # This MUST run before release-please to prevent "untagged PRs outstanding" abort | ||||||||
| # Release Please aborts if it finds merged PRs with "autorelease: pending" label | ||||||||
| # By running this first, we ensure all untagged PRs are tagged before Release Please checks | ||||||||
| handle-untagged-releases: | ||||||||
| name: 🔧 Handle Untagged Releases (Pre-Check) | ||||||||
| runs-on: ubuntu-latest | ||||||||
| outputs: | ||||||||
| release_created: ${{ steps.process.outputs.release_created }} | ||||||||
| tag_name: ${{ steps.process.outputs.tag_name }} | ||||||||
| version: ${{ steps.process.outputs.version }} | ||||||||
|
Comment on lines
+44
to
+47
There was a problem hiding this comment.
The job exports Useful? React with 👍 / 👎.
Comment on lines
+45
to
+47
There was a problem hiding this comment. The job outputs reference |
||||||||
| steps: | ||||||||
| - name: 📥 Checkout source code | ||||||||
| uses: actions/checkout@v4 | ||||||||
|
|
@@ -127,7 +92,6 @@ jobs: | |||||||
| echo " SHA: $MERGE_SHA" | ||||||||
| echo " Tag: $TAG_NAME" | ||||||||
|
|
||||||||
| if gh api repos/${{ github.repository }}/git/refs/tags/$TAG_NAME 2>/dev/null; then | ||||||||
| echo "✅ Tag $TAG_NAME already exists" | ||||||||
| else | ||||||||
|
|
@@ -138,13 +102,14 @@ jobs: | |||||||
| -f sha="$MERGE_SHA" | ||||||||
| fi | ||||||||
|
|
||||||||
| if gh release view $TAG_NAME --repo ${{ github.repository }} 2>/dev/null; then | ||||||||
| echo "✅ Release $TAG_NAME already exists" | ||||||||
| else | ||||||||
| echo "🎉 Creating GitHub Release $TAG_NAME" | ||||||||
| RELEASE_CREATED=true | ||||||||
| LATEST_TAG="$TAG_NAME" | ||||||||
| LATEST_VERSION="$VERSION" | ||||||||
|
|
||||||||
| CHANGELOG=$(awk -v ver="$VERSION" ' | ||||||||
| /^## \[/ { | ||||||||
| if (found) exit | ||||||||
|
|
@@ -157,7 +122,6 @@ jobs: | |||||||
| CHANGELOG="Release v$VERSION - See [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ github.ref_name }}/CHANGELOG.md) for details." | ||||||||
| fi | ||||||||
|
|
||||||||
| { | ||||||||
| echo "## 📦 Installation" | ||||||||
| echo "" | ||||||||
|
|
@@ -185,36 +149,88 @@ jobs: | |||||||
| echo "$CHANGELOG" | ||||||||
| } > /tmp/release_notes.md | ||||||||
|
|
||||||||
| gh release create $TAG_NAME \ | ||||||||
| --repo ${{ github.repository }} \ | ||||||||
| --title "v$VERSION" \ | ||||||||
| --notes-file /tmp/release_notes.md | ||||||||
| fi | ||||||||
|
|
||||||||
| echo "🏷️ Updating PR #$PR_NUM label to autorelease: tagged" | ||||||||
| gh pr edit $PR_NUM \ | ||||||||
| --repo ${{ github.repository }} \ | ||||||||
| --remove-label "autorelease: pending" \ | ||||||||
| --add-label "autorelease: tagged" || true | ||||||||
|
|
||||||||
| echo "✅ Processed PR #$PR_NUM" | ||||||||
| done < <(echo "$PENDING_PRS" | jq -c '.') | ||||||||
|
There was a problem hiding this comment. Conflicting input redirection for the while loop. The loop at line 76 already receives input via pipe ( |
||||||||
|
|
||||||||
| # Output the latest release info (if any was created) | ||||||||
| if [ "$RELEASE_CREATED" = "true" ]; then | ||||||||
| echo "release_created=true" >> $GITHUB_OUTPUT | ||||||||
| echo "tag_name=$LATEST_TAG" >> $GITHUB_OUTPUT | ||||||||
| echo "version=$LATEST_VERSION" >> $GITHUB_OUTPUT | ||||||||
| else | ||||||||
| echo "release_created=false" >> $GITHUB_OUTPUT | ||||||||
| fi | ||||||||
|
|
||||||||
| # ============================================================================= | ||||||||
| # Step 2: Run Release Please (after untagged PRs are handled) | ||||||||
| # ============================================================================= | ||||||||
| release-please: | ||||||||
| name: 📦 Release Please | ||||||||
| needs: handle-untagged-releases | ||||||||
| runs-on: ubuntu-latest | ||||||||
| outputs: | ||||||||
| release_created: ${{ steps.release.outputs.release_created }} | ||||||||
| releases_created: ${{ steps.release.outputs.releases_created }} | ||||||||
| tag_name: ${{ steps.release.outputs.tag_name }} | ||||||||
| version: ${{ steps.release.outputs.version }} | ||||||||
| major: ${{ steps.release.outputs.major }} | ||||||||
| minor: ${{ steps.release.outputs.minor }} | ||||||||
| patch: ${{ steps.release.outputs.patch }} | ||||||||
| sha: ${{ steps.release.outputs.sha }} | ||||||||
| pr: ${{ steps.release.outputs.pr }} | ||||||||
| prs_created: ${{ steps.release.outputs.prs_created }} | ||||||||
| steps: | ||||||||
| - name: 📥 Checkout source code | ||||||||
| uses: actions/checkout@v4 | ||||||||
|
|
||||||||
| - name: 🤖 Run Release Please | ||||||||
| id: release | ||||||||
| uses: googleapis/release-please-action@v4 | ||||||||
| with: | ||||||||
| token: ${{ secrets.GITHUB_TOKEN }} | ||||||||
| config-file: release-please-config.json | ||||||||
| manifest-file: .release-please-manifest.json | ||||||||
| target-branch: ${{ github.ref_name }} | ||||||||
|
|
||||||||
| - name: 📝 Log Release Info | ||||||||
| if: ${{ steps.release.outputs.releases_created == 'true' }} | ||||||||
| run: | | ||||||||
| echo "🎉 Release created!" | ||||||||
| echo "📦 Version: ${{ steps.release.outputs.version }}" | ||||||||
| echo "🏷️ Tag: ${{ steps.release.outputs.tag_name }}" | ||||||||
| echo "🔗 https://github.com/${{ github.repository }}/releases/tag/${{ steps.release.outputs.tag_name }}" | ||||||||
|
|
||||||||
| # ============================================================================= | ||||||||
| # Step 3: Verify Release | ||||||||
| # ============================================================================= | ||||||||
|
|
||||||||
| # ============================================================================= | ||||||||
| # Verify Release | ||||||||
| # ============================================================================= | ||||||||
|
Comment on lines
219
to
221
There was a problem hiding this comment. Duplicate comment headers. Lines 215-217 say "Step 3: Verify Release" and lines 219-221 repeat "Verify Release". Remove one set of these duplicate headers.
Suggested change
|
||||||||
| verify-release: | ||||||||
| name: ✅ Verify Release | ||||||||
| needs: [release-please, handle-untagged-releases] | ||||||||
| if: | | ||||||||
| needs.release-please.outputs.releases_created == 'true' || | ||||||||
| (needs.handle-untagged-releases.outputs.release_created == 'true' && needs.handle-untagged-releases.result == 'success') | ||||||||
| runs-on: ubuntu-latest | ||||||||
| steps: | ||||||||
| - name: 📥 Checkout source code | ||||||||
| uses: actions/checkout@v4 | ||||||||
| with: | ||||||||
| ref: ${{ needs.release-please.outputs.releases_created == 'true' && needs.release-please.outputs.tag_name || needs.handle-untagged-releases.outputs.tag_name }} | ||||||||
|
|
||||||||
| - name: 🎯 Install Dart SDK | ||||||||
| uses: dart-lang/setup-dart@v1 | ||||||||
|
|
@@ -228,7 +244,7 @@ jobs: | |||||||
| run: | | ||||||||
| echo "📦 Verifying package version..." | ||||||||
| VERSION=$(grep '^version:' pubspec.yaml | awk '{print $2}') | ||||||||
| EXPECTED="${{ needs.release-please.outputs.releases_created == 'true' && needs.release-please.outputs.version || needs.handle-untagged-releases.outputs.version }}" | ||||||||
| if [ "$VERSION" != "$EXPECTED" ]; then | ||||||||
| echo "❌ Version mismatch: pubspec.yaml has $VERSION, expected $EXPECTED" | ||||||||
| exit 1 | ||||||||
|
|
@@ -243,7 +259,8 @@ jobs: | |||||||
|
|
||||||||
| - name: 📋 Release Summary | ||||||||
| run: | | ||||||||
| VERSION="${{ needs.release-please.outputs.releases_created == 'true' && needs.release-please.outputs.version || needs.handle-untagged-releases.outputs.version }}" | ||||||||
| echo "## 🎉 Release v$VERSION Verified!" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo "" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo "### 📦 Installation" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo "" >> $GITHUB_STEP_SUMMARY | ||||||||
|
|
@@ -254,9 +271,9 @@ jobs: | |||||||
| echo " git:" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo " url: https://github.com/open-runtime/grpc-dart" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo " tag_pattern: \"^v\"" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo " version: ^$VERSION" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo "\`\`\`" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo "" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo "### 🔗 Links" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo "- [GitHub Release](https://github.com/${{ github.repository }}/releases/tag/v$VERSION)" >> $GITHUB_STEP_SUMMARY | ||||||||
| echo "- [Changelog](https://github.com/${{ github.repository }}/blob/${{ github.ref_name }}/CHANGELOG.md)" >> $GITHUB_STEP_SUMMARY | ||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding
workflow_dispatchtrigger without handling the case whengithub.event.pull_requestis null will cause failures. When manually triggered,github.event.pull_request.number(line 12),github.event.pull_request.head.ref(lines 24, 30, 145, 319),github.event.pull_request.title(line 38), andgithub.event.pull_request.base.ref(lines 58-59) will all be undefined, causing the workflow to fail. Either add inputs toworkflow_dispatchto provide these values, or guard the job execution with a condition that checks if the trigger ispull_request.