Skip to content

Sync main into release-candidate#84

Merged
github-actions[bot] merged 12 commits into
release-candidatefrom
automation/main-to-release-candidate
Jul 17, 2026
Merged

Sync main into release-candidate#84
github-actions[bot] merged 12 commits into
release-candidatefrom
automation/main-to-release-candidate

Conversation

@github-actions

Copy link
Copy Markdown

Automated promotion of the latest main branch changes into release-candidate.

This pull request is maintained by the Promote main to release candidate workflow. Its dedicated branch allows Copilot to resolve conflicts without modifying the default branch.

ToonCasteele and others added 11 commits July 16, 2026 10:34
* Deploy release candidates separately (#66)

* Add release candidate deployment

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Configure release candidate deployment

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Deploy RC only after pull requests merge

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Keep production deploys limited to main

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ification-subscription-system"

This reverts commit e37817b, reversing
changes made to d75ba11.
revert: undo PR #62 subscription digest update
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Use the target branch workflow for merged main pull requests and keep manual sync runs on main only.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Trigger the promotion workflow on main pushes and keep manual dispatches restricted to main.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Use explicit workflow dispatch and job expressions so GitHub registers the promotion workflow correctly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ase-candidate workflow (#80)

* Initial plan

* Fix sync job: add GH_REPO env var so gh CLI resolves repo without checkout

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
…ion rules (#82)

* Initial plan

* ci: fall back to direct merge when auto-merge requires branch protection

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
* Use dedicated promotion branch

* Run promotion after conflict resolution

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Keep promotion branch current safely

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: ToonCasteele <99814254+ToonCasteele@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
@ToonCasteele

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved all 5 conflicts in commit 7e805d7:

  • .github/pull_request_template.md — kept main's wording (write-capable → RC, read-only → main)
  • sync-main-to-release-candidate.yml — accepted the deletion from main (replaced by promote-main-to-release-candidate.yml)
  • DynamicsActivitiesPackage.csproj — kept RC's v1.8.113 (higher than main's v1.8.91)
  • DynamicsActivities_Summarize.cs — kept RC's new GetActivityTimelineTimestampUtc / GetActivityTimelineTimestampSortKey helper methods
  • README.md — updated workflow table to the new filename from main; used main's simpler PR-base policy text

release-candidate is now a full ancestor of this branch — the PR should be conflict-free.

Copilot AI requested a review from ToonCasteele July 17, 2026 12:06
@github-actions
github-actions Bot merged commit f11b8a6 into release-candidate Jul 17, 2026
2 checks passed
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.

3 participants