Skip to content

Merge back to dev#54

Merged
MaxMB15 merged 3 commits intodevfrom
main
Apr 5, 2026
Merged

Merge back to dev#54
MaxMB15 merged 3 commits intodevfrom
main

Conversation

@MaxMB15
Copy link
Copy Markdown
Owner

@MaxMB15 MaxMB15 commented Apr 5, 2026

No description provided.

MaxMB15 and others added 3 commits April 6, 2026 00:38
- New release-pipeline.yml: merges dev→main, bumps version, pushes tag
  in a single workflow dispatch (replaces 13-step manual process)
- Add sync-dev job to release.yml: auto-merges main→dev after publish
- Skip heavy platform builds on version-bump PRs in build.yml

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- Export CURRENT before Python subprocess reads it (was KeyError)
- Remove unused skip_ci_wait input
- Check dev branch existence before git fetch (avoids failure)
- Add run ID to fallback branch name to prevent collisions

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
feat: add one-click release pipeline workflow
Copilot AI review requested due to automatic review settings April 5, 2026 22:48
@MaxMB15 MaxMB15 merged commit 81de4d3 into dev Apr 5, 2026
4 checks passed
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds automation around the release flow by introducing a one-click release pipeline, ensuring main is synced back into dev after a successful tagged release, and reducing CI load for version-bump PRs.

Changes:

  • Add a sync-dev job to release.yml to auto-merge maindev after publishing latest.json, with PR fallback on conflicts.
  • Add a new release-pipeline.yml workflow to merge devmain, bump version, and push a release tag in one run.
  • Skip macOS/Linux platform build jobs for chore-bump-v* version-bump PR branches.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

File Description
.github/workflows/release.yml Adds post-release maindev synchronization job with conflict PR fallback.
.github/workflows/release-pipeline.yml Introduces a workflow_dispatch “one-click” release pipeline (merge, bump, tag).
.github/workflows/build.yml Avoids running platform builds on version-bump PR branches.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines +421 to +434
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.RELEASE_AUTOMATION_PAT || github.token }}

- name: Configure git
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"

- name: Merge main into dev
env:
GH_TOKEN: ${{ secrets.RELEASE_AUTOMATION_PAT || github.token }}
run: |
Copy link

Copilot AI Apr 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync-dev falls back to github.token for both actions/checkout and GH_TOKEN. In this repo, release-bump.yml explicitly requires secrets.RELEASE_AUTOMATION_PAT because the default token often cannot create PRs (createPullRequest not permitted). Consider requiring the PAT here as well (or gracefully skipping PR creation when it’s absent) so the conflict fallback doesn’t fail mid-sync.

Copilot uses AI. Check for mistakes.
Comment on lines +105 to +108
# Merge dev into main (non-interactive)
echo "Merging origin/dev into main..."
git merge origin/dev --no-edit -m "Merge branch 'dev' into main for release"

Copy link

Copilot AI Apr 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This merge step doesn’t handle conflicts beyond failing the job. Since this workflow is meant to be “one-click”, consider detecting merge conflicts and switching to a PR-based flow (similar to sync-dev in release.yml) so the pipeline can still complete with a clear next action instead of leaving a failed run.

Copilot uses AI. Check for mistakes.
Comment on lines +111 to +117
echo "Commits from dev:"
git log origin/main..HEAD --oneline
else
git push origin main
echo "Pushed merged main."
fi

Copy link

Copilot AI Apr 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The workflow pushes to main immediately after merging dev (before the version bump and tag). If a later step fails (bump/commit/tag), main is left partially updated without a corresponding release/tag. Consider deferring the push until after the version bump commit is created (single push), or doing all work on a temporary branch and only updating main once the entire pipeline is ready.

Suggested change
echo "Commits from dev:"
git log origin/main..HEAD --oneline
else
git push origin main
echo "Pushed merged main."
fi
else
echo "Merged dev into local main. Deferring push until after version bump/tag steps succeed."
fi
echo "Commits from origin/main to current HEAD:"
git log origin/main..HEAD --oneline

Copilot uses AI. Check for mistakes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants