Skip to content

Commit 2d34956

Browse files
committed
use main instead of master in readme
1 parent 93a003e commit 2d34956

File tree

2 files changed

+4
-36
lines changed

2 files changed

+4
-36
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
trigger:
77
branches:
88
include:
9-
- master
10-
- dev3
11-
- dev2
12-
- dev
9+
- main
10+
- dev*
1311
tags:
1412
include:
1513
- v*
@@ -184,35 +182,6 @@ jobs:
184182
# Other OS versions (just debug mode)
185183
# ----------------------------------------------------------
186184

187-
- job:
188-
displayName: Windows 2019
189-
pool:
190-
vmImage:
191-
windows-2019
192-
strategy:
193-
matrix:
194-
Debug:
195-
BuildType: debug
196-
cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Debug -DMI_DEBUG_FULL=ON
197-
MSBuildConfiguration: Debug
198-
Release:
199-
BuildType: release
200-
cmakeExtraArgs: -DCMAKE_BUILD_TYPE=Release
201-
MSBuildConfiguration: Release
202-
steps:
203-
- task: CMake@1
204-
inputs:
205-
workingDirectory: $(BuildType)
206-
cmakeArgs: .. $(cmakeExtraArgs)
207-
- task: MSBuild@1
208-
inputs:
209-
solution: $(BuildType)/libmimalloc.sln
210-
configuration: '$(MSBuildConfiguration)'
211-
msbuildArguments: -m
212-
- script: ctest --verbose --timeout 240 -C $(MSBuildConfiguration)
213-
workingDirectory: $(BuildType)
214-
displayName: CTest
215-
216185
- job:
217186
displayName: Ubuntu 24.04
218187
pool:

readme.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,14 @@ Enjoy!
7272

7373
### Branches
7474

75-
* `master`: latest stable release (still based on `dev2`).
75+
* `main`: latest stable release (still based on `dev2`).
7676
* `dev`: development branch for mimalloc v1. Use this branch for submitting PR's.
7777
* `dev2`: development branch for mimalloc v2. This branch is downstream of `dev`
7878
(and is essentially equal to `dev` except for `src/segment.c`). Uses larger sliced segments to manage
7979
mimalloc pages that can reduce fragmentation.
8080
* `dev3`: development branch for mimalloc v3-beta. This branch is downstream of `dev`. This version
8181
simplifies the lock-free ownership of previous versions, has no thread-local segments any more.
82-
This improves sharing of memory between threads, and on certain large workloads may use less memory
83-
with less fragmentation.
82+
This improves sharing of memory between threads, and on certain large workloads may use (much) less memory.
8483

8584
### Releases
8685

0 commit comments

Comments
 (0)