Merge pull request #6567 from rescript-lang/add_ci_to_release_branch

Add CI to release branch

Author: fhammerschmidt

.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

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:

packages/std/package.json

@@ -23,4 +23,4 @@
     "url": "https://github.com/rescript-compiler/issues"
   },
   "homepage": "http://rescript-lang.org"
-}
+}