Skip to content

Add CI to release branch #6567

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

Merged
merged 3 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion packages/std/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"url": "https://github.com/rescript-compiler/issues"
},
"homepage": "http://rescript-lang.org"
}
}