Skip to content

Commit cc4754f

Browse files
committed
chore: revert to simple direct push now that branch protection is removed
1 parent ebf909c commit cc4754f

File tree

1 file changed

+4
-42
lines changed

1 file changed

+4
-42
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
runs-on: ubuntu-latest
2222
permissions:
2323
contents: write
24-
pull-requests: write
2524

2625
steps:
2726
- name: Checkout
@@ -55,11 +54,9 @@ jobs:
5554
echo "next=$NEXT" >> $GITHUB_OUTPUT
5655
echo "Bumping from $CURRENT to $NEXT"
5756
58-
- name: Create version bump branch and PR
59-
id: pr
57+
- name: Update version files
6058
run: |
6159
VERSION="${{ steps.version.outputs.next }}"
62-
BRANCH="release/v$VERSION"
6360
6461
# Update extension.yaml
6562
sed -i "s/^version: .*/version: $VERSION/" cli/extension.yaml
@@ -78,49 +75,14 @@ jobs:
7875
cat CHANGELOG.md
7976
} > CHANGELOG.new.md
8077
mv CHANGELOG.new.md CHANGELOG.md
81-
cd ..
8278
83-
# Create branch and push
79+
# Commit version bump
80+
cd ..
8481
git config user.name "github-actions[bot]"
8582
git config user.email "github-actions[bot]@users.noreply.github.com"
86-
git checkout -b "$BRANCH"
8783
git add cli/extension.yaml cli/CHANGELOG.md
8884
git commit -m "chore: bump version to $VERSION"
89-
git push origin "$BRANCH"
90-
91-
# Create PR
92-
PR_URL=$(gh pr create \
93-
--base main \
94-
--head "$BRANCH" \
95-
--title "chore: release v$VERSION" \
96-
--body "Automated release for version $VERSION")
97-
98-
echo "pr_url=$PR_URL" >> $GITHUB_OUTPUT
99-
echo "branch=$BRANCH" >> $GITHUB_OUTPUT
100-
env:
101-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
102-
103-
- name: Auto-merge PR and wait
104-
run: |
105-
# Enable auto-merge
106-
gh pr merge "${{ steps.pr.outputs.pr_url }}" --squash --auto
107-
108-
# Wait for PR to be merged (checks will run)
109-
echo "Waiting for CI checks and PR merge..."
110-
for i in {1..60}; do
111-
if gh pr view "${{ steps.pr.outputs.pr_url }}" --json state --jq .state | grep -q "MERGED"; then
112-
echo "PR merged successfully!"
113-
break
114-
fi
115-
echo "Waiting... ($i/60)"
116-
sleep 10
117-
done
118-
119-
# Pull latest main
120-
git checkout main
121-
git pull origin main
122-
env:
123-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
85+
git push
12486
12587
- name: Set up Node.js
12688
uses: actions/setup-node@v4

0 commit comments

Comments
 (0)