diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d761d8c8..df608b17 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,8 +6,10 @@ trigger: branches: include: - - main - - dev* + - master + - dev3 + - dev2 + - dev tags: include: - v* diff --git a/readme.md b/readme.md index 76e2711e..fd97c28c 100644 --- a/readme.md +++ b/readme.md @@ -72,14 +72,15 @@ Enjoy! ### Branches -* `main`: latest stable release (still based on `dev2`). +* `master`: latest stable release (still based on `dev2`). * `dev`: development branch for mimalloc v1. **Use this branch for submitting PR's**. * `dev2`: development branch for mimalloc v2. This branch is downstream of `dev` (and is essentially equal to `dev` except for `src/segment.c`). Uses larger sliced segments to manage mimalloc pages that can reduce fragmentation. -* `dev3`: development branch for mimalloc v3-beta. This branch is also downstream of `dev`. This version +* `dev3`: development branch for mimalloc v3-beta. This branch is downstream of `dev`. This version simplifies the lock-free ownership of previous versions, has no thread-local segments any more. - This improves sharing of memory between threads, and on certain large workloads may use (much) less memory. + This improves sharing of memory between threads, and on certain large workloads may use less memory + with less fragmentation. ### Releases