From a2463e53937710597a10aa64488034dacb091ef1 Mon Sep 17 00:00:00 2001 From: rvanasa Date: Thu, 19 Jun 2025 11:57:43 -0600 Subject: [PATCH 1/3] Add sync workflow --- .github/workflows/sync.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/sync.yml diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml new file mode 100644 index 000000000..706a87cdb --- /dev/null +++ b/.github/workflows/sync.yml @@ -0,0 +1,17 @@ +name: Sync main and next-moc +on: + push: + branches: + - main +jobs: + sync-branch: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Merge main -> next-moc + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: main + target_branch: next-moc + github_token: ${{ github.token }} From 09b1b8c9b3ecc1550e374356576a5444b4013daa Mon Sep 17 00:00:00 2001 From: rvanasa Date: Thu, 19 Jun 2025 12:05:36 -0600 Subject: [PATCH 2/3] Add Markdown file with information about the 'next-moc' branch --- Release.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Release.md diff --git a/Release.md b/Release.md new file mode 100644 index 000000000..fb4193c73 --- /dev/null +++ b/Release.md @@ -0,0 +1,23 @@ +# Release process + +Please refer to the [release instructions](https://github.com/dfinity/motoko/blob/master/Building.md#making-releases) in the Motoko repository. + +## The `next-moc` branch + +The `next-moc` branch contains changes that make base compatible with the +in-development version of `moc`. This repository's public CI does _not_ run +on that branch. + +External contributions are best made against `master`. + +- `master` branch is meant for the newest **released** version of `moc` + - The CI runs on this branch +- `next-moc` branch is meant for the **in-development** version of `moc` + - This branch is used by the [`motoko` repository](https://github.com/dfinity/motoko)'s CI + +Both branches are kept in sync with each other by mutual, circular merges: +- `next-moc` is updated automatically on each push to `master` via the [sync.yml](.github/workflows/sync.yml) workflow +- `master` is updated **manually** on each release of `moc` as part of the `motoko` release process + +Only *normal* merges are allowed between `master` and `next-moc`, because development is permitted on both branches. +This policy makes every PR (to either branch) visible in the history of both branches. \ No newline at end of file From eb0d3b21e5a4dac76ca149ade46bff608753148e Mon Sep 17 00:00:00 2001 From: Ryan Vandersmith Date: Mon, 23 Jun 2025 08:36:02 -0600 Subject: [PATCH 3/3] Update Release.md Co-authored-by: Christoph --- Release.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Release.md b/Release.md index fb4193c73..1b5968182 100644 --- a/Release.md +++ b/Release.md @@ -8,16 +8,16 @@ The `next-moc` branch contains changes that make base compatible with the in-development version of `moc`. This repository's public CI does _not_ run on that branch. -External contributions are best made against `master`. +External contributions are best made against `main`. -- `master` branch is meant for the newest **released** version of `moc` +- `main` branch is meant for the newest **released** version of `moc` - The CI runs on this branch - `next-moc` branch is meant for the **in-development** version of `moc` - This branch is used by the [`motoko` repository](https://github.com/dfinity/motoko)'s CI Both branches are kept in sync with each other by mutual, circular merges: -- `next-moc` is updated automatically on each push to `master` via the [sync.yml](.github/workflows/sync.yml) workflow -- `master` is updated **manually** on each release of `moc` as part of the `motoko` release process +- `next-moc` is updated automatically on each push to `main` via the [sync.yml](.github/workflows/sync.yml) workflow +- `main` is updated **manually** on each release of `moc` as part of the `motoko` release process -Only *normal* merges are allowed between `master` and `next-moc`, because development is permitted on both branches. +Only *normal* merges are allowed between `main` and `next-moc`, because development is permitted on both branches. This policy makes every PR (to either branch) visible in the history of both branches. \ No newline at end of file