Commit 07ebfb74f916f4653e5189eacfb34c2b01a06be4
1 parent
88a48300
Update master -> main in maintainer documentation
Showing
1 changed file
with
5 additions
and
5 deletions
README-maintainer
| @@ -44,7 +44,7 @@ GOOGLE OSS-FUZZ | @@ -44,7 +44,7 @@ GOOGLE OSS-FUZZ | ||
| 44 | Clone the oss-fuzz project. From the root directory of the repository: | 44 | Clone the oss-fuzz project. From the root directory of the repository: |
| 45 | 45 | ||
| 46 | Add `-e GITHUB_FORK=fork -e GITHUB_BRANCH=branch` to build_fuzzers | 46 | Add `-e GITHUB_FORK=fork -e GITHUB_BRANCH=branch` to build_fuzzers |
| 47 | - from a qpdf fork/branch rather than qpdf/master. | 47 | + from a qpdf fork/branch rather than qpdf/main. |
| 48 | 48 | ||
| 49 | python3 infra/helper.py build_image --pull qpdf | 49 | python3 infra/helper.py build_image --pull qpdf |
| 50 | python3 infra/helper.py build_fuzzers [ --sanitizer memory|undefined|address ] qpdf | 50 | python3 infra/helper.py build_fuzzers [ --sanitizer memory|undefined|address ] qpdf |
| @@ -252,7 +252,7 @@ pytest -n auto | @@ -252,7 +252,7 @@ pytest -n auto | ||
| 252 | 252 | ||
| 253 | CREATING A RELEASE | 253 | CREATING A RELEASE |
| 254 | 254 | ||
| 255 | -* Push to master. This will create an artifact called distribution | 255 | +* Push to main. This will create an artifact called distribution |
| 256 | which will contain all the distribution files. Download these, | 256 | which will contain all the distribution files. Download these, |
| 257 | verify the checksums from the job output, rename to remove -ci from | 257 | verify the checksums from the job output, rename to remove -ci from |
| 258 | the names, and copy to the release archive area. | 258 | the names, and copy to the release archive area. |
| @@ -283,12 +283,12 @@ chmod 555 *.AppImage | @@ -283,12 +283,12 @@ chmod 555 *.AppImage | ||
| 283 | `README-what-to-download.md` separately onto the download area if | 283 | `README-what-to-download.md` separately onto the download area if |
| 284 | needed. | 284 | needed. |
| 285 | 285 | ||
| 286 | -* Ensure that the master branch has been pushed to github. The | 286 | +* Ensure that the main branch has been pushed to github. The |
| 287 | rev-parse command below should show the same commit hash for all its | 287 | rev-parse command below should show the same commit hash for all its |
| 288 | arguments. Create and push a signed tag. This should be run with | 288 | arguments. Create and push a signed tag. This should be run with |
| 289 | - HEAD pointing to the tip of master. | 289 | + HEAD pointing to the tip of main. |
| 290 | 290 | ||
| 291 | -git rev-parse upstream/master @ | 291 | +git rev-parse upstream/main @ |
| 292 | git tag -s release-qpdf-$version @ -m"qpdf $version" | 292 | git tag -s release-qpdf-$version @ -m"qpdf $version" |
| 293 | git push upstream release-qpdf-$version | 293 | git push upstream release-qpdf-$version |
| 294 | 294 |