Skip to content

Commit 0b39531

Browse files
committed
moving all references to release branch
was previously `master`
1 parent 645a297 commit 0b39531

9 files changed

+20
-20
lines changed

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ possible.
55
## Our Development Process
66
New versions are being developed in the "dev" branch,
77
or in their own feature branch.
8-
When they are deemed ready for a release, they are merged into "master".
8+
When they are deemed ready for a release, they are merged into "release".
99

1010
As a consequences, all contributions must stage first through "dev"
1111
or their own feature branch.
@@ -383,7 +383,7 @@ CI tests run every time a pull request (PR) is created or updated. The exact tes
383383
that get run will depend on the destination branch you specify. Some tests take
384384
longer to run than others. Currently, our CI is set up to run a short
385385
series of tests when creating a PR to the dev branch and a longer series of tests
386-
when creating a PR to the master branch. You can look in the configuration files
386+
when creating a PR to the release branch. You can look in the configuration files
387387
of the respective CI platform for more information on what gets run when.
388388
389389
Most people will just want to create a PR with the destination set to their local dev

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ Zstandard is dual-licensed under [BSD](LICENSE) and [GPLv2](COPYING).
193193

194194
## Contributing
195195

196-
The "dev" branch is the one where all contributions are merged before reaching "master".
197-
If you plan to propose a patch, please commit into the "dev" branch, or its own feature branch.
198-
Direct commit to "master" are not permitted.
196+
The `dev` branch is the one where all contributions are merged before reaching `release`.
197+
If you plan to propose a patch, please commit into the `dev` branch, or its own feature branch.
198+
Direct commit to `release` are not permitted.
199199
For more information, please read [CONTRIBUTING](CONTRIBUTING.md).

TESTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ They consist of the following tests:
2727

2828
Long Tests
2929
----------
30-
Long tests run on all commits to `master` branch,
30+
Long tests run on all commits to `release` branch,
3131
and once a day on the current version of `dev` branch,
3232
on TravisCI.
3333
They consist of the following tests:

appveyor.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# Following tests are run _only_ on master branch
2-
# To reproduce these tests, it's possible to push into a branch `appveyorTest`
3-
# or a branch `visual*`, they will intentionnally trigger `master` tests
1+
# Following tests are run _only_ on `release` branch
2+
# and on selected feature branch named `appveyorTest` or `visual*`
43

54
-
65
version: 1.0.{build}
76
branches:
87
only:
8+
- release
99
- master
10-
- appveyorTest
10+
- /appveyor*/
1111
- /visual*/
1212
environment:
1313
matrix:
@@ -92,9 +92,9 @@
9292
cd programs\ && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe &&
9393
appveyor PushArtifact zstd-win-binary-%PLATFORM%.zip &&
9494
cp zstd.exe ..\bin\zstd.exe &&
95-
git clone --depth 1 --branch master https://github.com/facebook/zstd &&
95+
git clone --depth 1 --branch release https://github.com/facebook/zstd &&
9696
cd zstd &&
97-
git archive --format=tar master -o zstd-src.tar &&
97+
git archive --format=tar release -o zstd-src.tar &&
9898
..\zstd -19 zstd-src.tar &&
9999
appveyor PushArtifact zstd-src.tar.zst &&
100100
certUtil -hashfile zstd-src.tar.zst SHA256 > zstd-src.tar.zst.sha256.sig &&

contrib/seekable_format/zstd_seekable_compression_format.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ __`Frame_Size`__
5353
The total size of the skippable frame, not including the `Skippable_Magic_Number` or `Frame_Size`.
5454
This is for compatibility with [Zstandard skippable frames].
5555

56-
[Zstandard skippable frames]: https://github.com/facebook/zstd/blob/master/doc/zstd_compression_format.md#skippable-frames
56+
[Zstandard skippable frames]: https://github.com/facebook/zstd/blob/release/doc/zstd_compression_format.md#skippable-frames
5757

5858
#### `Seek_Table_Footer`
5959
The seek table footer format is as follows:

lib/compress/zstd_compress.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3258,7 +3258,7 @@ size_t ZSTD_loadCEntropy(ZSTD_compressedBlockState_t* bs, void* workspace,
32583258

32593259
/* Dictionary format :
32603260
* See :
3261-
* https://github.com/facebook/zstd/blob/master/doc/zstd_compression_format.md#dictionary-format
3261+
* https://github.com/facebook/zstd/blob/release/doc/zstd_compression_format.md#dictionary-format
32623262
*/
32633263
/*! ZSTD_loadZstdDictionary() :
32643264
* @return : dictID, or an error code

lib/decompress/zstd_decompress_block.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ size_t ZSTD_decodeLiteralsBlock(ZSTD_DCtx* dctx,
236236

237237
/* Default FSE distribution tables.
238238
* These are pre-calculated FSE decoding tables using default distributions as defined in specification :
239-
* https://github.com/facebook/zstd/blob/master/doc/zstd_compression_format.md#default-distributions
239+
* https://github.com/facebook/zstd/blob/release/doc/zstd_compression_format.md#default-distributions
240240
* They were generated programmatically with following method :
241241
* - start from default distributions, present in /lib/common/zstd_internal.h
242242
* - generate tables normally, using ZSTD_buildFSETable()

tests/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ desktop machine for every pull request that is made to the zstd repo but can als
2828
be run on any machine via the command line interface.
2929

3030
There are three modes of usage for this script: fastmode will just run a minimal single
31-
build comparison (between facebook:dev and facebook:master), onetime will pull all the current
31+
build comparison (between facebook:dev and facebook:release), onetime will pull all the current
3232
pull requests from the zstd repo and compare facebook:dev to all of them once, continuous
3333
will continuously get pull requests from the zstd repo and run benchmarks against facebook:dev.
3434

tests/automated_benchmarking.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
GITHUB_API_PR_URL = "https://api.github.com/repos/facebook/zstd/pulls?state=open"
2222
GITHUB_URL_TEMPLATE = "https://github.com/{}/zstd"
23-
MASTER_BUILD = {"user": "facebook", "branch": "dev", "hash": None}
23+
RELEASE_BUILD = {"user": "facebook", "branch": "dev", "hash": None}
2424

2525
# check to see if there are any new PRs every minute
2626
DEFAULT_MAX_API_CALL_FREQUENCY_SEC = 60
@@ -264,11 +264,11 @@ def main(filenames, levels, iterations, builds=None, emails=None, continuous=Fal
264264
for test_build in builds:
265265
if dictionary_filename == None:
266266
regressions = get_regressions(
267-
MASTER_BUILD, test_build, iterations, filenames, levels
267+
RELEASE_BUILD, test_build, iterations, filenames, levels
268268
)
269269
else:
270270
regressions = get_regressions_dictionary(
271-
MASTER_BUILD, test_build, filenames, dictionary_filename, levels, iterations
271+
RELEASE_BUILD, test_build, filenames, dictionary_filename, levels, iterations
272272
)
273273
body = "\n".join(regressions)
274274
if len(regressions) > 0:
@@ -320,7 +320,7 @@ def main(filenames, levels, iterations, builds=None, emails=None, continuous=Fal
320320
builds = [{"user": None, "branch": "None", "hash": None}]
321321
main(filenames, levels, iterations, builds, frequency=frequency, dictionary_filename=dictionary_filename)
322322
elif mode == "fastmode":
323-
builds = [{"user": "facebook", "branch": "master", "hash": None}]
323+
builds = [{"user": "facebook", "branch": "release", "hash": None}]
324324
main(filenames, levels, iterations, builds, frequency=frequency, dictionary_filename=dictionary_filename)
325325
else:
326326
main(filenames, levels, iterations, None, emails, True, frequency=frequency, dictionary_filename=dictionary_filename)

0 commit comments

Comments
 (0)