Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .github/workflows/backmerge-to-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ jobs:
# Create PR using GitHub CLI
PR_TITLE="chore: backmerge v${{ steps.version.outputs.version }} to develop"

cat > pr_body.md << 'PREOF'
cat > pr_body.md << EOF
## Automated Backmerge

This PR automatically backmerges changes from `main` to `develop` branch.
This PR automatically backmerges changes from \`main\` to \`develop\` branch.

### Source
- **Original PR:** #${{ github.event.pull_request.number }}
Expand All @@ -98,7 +98,7 @@ jobs:
- **Merged at:** ${{ github.event.pull_request.merged_at }}

### Branch Information
- **Source branch:** `${{ github.event.pull_request.head.ref }}`
- **Source branch:** \`${{ github.event.pull_request.head.ref }}\`
- **Type:** ${{ github.event.pull_request.head.ref }}

### Actions Required
Expand All @@ -109,7 +109,7 @@ jobs:

---
*This PR was automatically created by GitHub Actions workflow.*
PREOF
EOF

# Create PR with review requirements
# Uncomment --draft if you want PRs to be created as draft
Expand All @@ -136,10 +136,10 @@ jobs:
# Create PR with conflict warning
PR_TITLE="chore: backmerge v${{ steps.version.outputs.version }} to develop (conflicts)"

cat > pr_conflict_body.md << 'CONFLICT_EOF'
cat > pr_conflict_body.md << EOF
## ⚠️ Automated Backmerge with Conflicts

This PR attempts to backmerge changes from `main` to `develop` branch, but **conflicts were detected**.
This PR attempts to backmerge changes from \`main\` to \`develop\` branch, but **conflicts were detected**.

### Source
- **Original PR:** #${{ github.event.pull_request.number }}
Expand All @@ -148,28 +148,28 @@ jobs:
- **Merged at:** ${{ github.event.pull_request.merged_at }}

### Branch Information
- **Source branch:** `${{ github.event.pull_request.head.ref }}`
- **Source branch:** \`${{ github.event.pull_request.head.ref }}\`
- **Type:** ${{ github.event.pull_request.head.ref }}

### ⚠️ Manual Actions Required
1. Checkout the branch locally
2. Merge `main` and resolve conflicts manually
2. Merge \`main\` and resolve conflicts manually
3. Push the resolved changes
4. Request review and merge this PR

```bash
\`\`\`bash
git fetch origin
git checkout -b ${BACKMERGE_BRANCH} origin/${BACKMERGE_BRANCH}
git checkout -b \${BACKMERGE_BRANCH} origin/\${BACKMERGE_BRANCH}
git merge origin/main
# Resolve conflicts in your editor
git add .
git commit
git push origin ${BACKMERGE_BRANCH}
```
git push origin \${BACKMERGE_BRANCH}
\`\`\`

---
*This PR was automatically created by GitHub Actions workflow. Manual conflict resolution is required.*
CONFLICT_EOF
EOF

gh pr create \
--base develop \
Expand Down
218 changes: 0 additions & 218 deletions .github/workflows/create-release.yml

This file was deleted.

16 changes: 16 additions & 0 deletions .github/workflows/release-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,22 @@ jobs:

echo "✅ Tag $VERSION created and pushed successfully"

- name: Trigger deployment workflow
if: steps.check_tag.outputs.tag_exists == 'false'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
VERSION="${{ steps.version.outputs.version }}"

echo "🚀 Manually triggering deployment workflow for tag $VERSION..."

# Trigger the deploy workflow by creating a repository dispatch event
# Since we can't directly trigger tag-based workflows, we'll use workflow_dispatch
# But first, let's try using the GitHub CLI to trigger it
gh workflow run deploy.yml --ref "$VERSION" || echo "⚠️ Could not trigger via workflow dispatch, deployment should trigger automatically"

echo "✅ Deployment trigger attempted"

# STEP 2: CREATE BACK-MERGE TO DEVELOP
- name: Generate unique back-merge branch name
id: branch_name
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
## [v1.1.1] - 2025-09-08

### Fixed

- Correct changelog script arguments in create-release workflow (4b1f559)

### Maintenance

- Prepare v1.1.1 hotfix (ebdc3b8)

### Other

- Duplicate create-release.yml workflow (2a30f06)

## [v1.1.0] - 2025-09-08

### Added
Expand Down