diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80fff87c15..ff71476b12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,14 +2,14 @@ name: CI on: push: - branches: [master] + branches: [master, 11.0_release] # See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet tags: - "v[0-9]+.[0-9]+.[0-9]+" - "v[0-9]+.[0-9]+.[0-9]+-*" pull_request: - branches: [master] + branches: [master, 11.0_release] concurrency: group: ci-${{ github.ref }}-1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad19e3b306..56a9d7391a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -351,6 +351,13 @@ Javascript Code Note that there is one design goal to keep in mind, never introduce any meaningless symbol unless necessary, we do optimizations, however, it should also compile readable output code. +## PR target branch + +Target branch `master` for development of new (breaking) features (v12). + +Bug fixes and maintenance should target branch `11.0_release`. +We'll merge `11.0_release` into `master` from time to time to propagate those changes. + ## Release Process To build a new version and release it on NPM, follow these steps: diff --git a/packages/std/package.json b/packages/std/package.json index 2574f2f84b..6d9507b846 100644 --- a/packages/std/package.json +++ b/packages/std/package.json @@ -23,4 +23,4 @@ "url": "https://github.com/rescript-compiler/issues" }, "homepage": "http://rescript-lang.org" -} \ No newline at end of file +}