-
Notifications
You must be signed in to change notification settings - Fork 9
Setup next-moc branch
#335
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
rvanasa
wants to merge
5
commits into
main
Choose a base branch
from
setup-next-moc
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a2463e5
Add sync workflow
rvanasa 09b1b8c
Add Markdown file with information about the 'next-moc' branch
rvanasa 817329f
Merge branch 'main' of https://github.com/dfinity/new-motoko-base int…
rvanasa eb0d3b2
Update Release.md
rvanasa 9628bff
Merge branch 'main' into setup-next-moc
rvanasa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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/[email protected] | ||
| with: | ||
| type: now | ||
| from_branch: main | ||
| target_branch: next-moc | ||
| github_token: ${{ github.token }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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. | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.