Skip to content

Commit 3f86475

Browse files
committed
rename master to main
1 parent 915d7f7 commit 3f86475

File tree

4 files changed

+20
-28
lines changed

4 files changed

+20
-28
lines changed

Changelog.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ This release introduces lots of changes to repository structure and development
9090

9191
### Changed
9292

93-
- The master branch no longer tracks the vendor directory. This means that it is not suitable as a ProcessWire module. Instead you need to use [latest release][latest-release] tags as a ProcessWire module. Release branches are a minified version of this module that includes everything needed and works out of the box. The master branch is used for development.
93+
- The main branch no longer tracks the vendor directory. This means that it is not suitable as a ProcessWire module. Instead you need to use [latest release][latest-release] tags as a ProcessWire module. Release branches are a minified version of this module that includes everything needed and works out of the box. The main branch is used for development.
9494
- Now we have a Continious Integration implemented. [![Build Status][travis-ci-badge]][travis-ci] This means that people can contribute confidently by running test suite and be sure that nothing has broken and a pull-request will be merged.
9595
- `$ProcessGraphQL->executeGraphQL` now accepts `payload` & `variables` as an argument. This allows you to modify the payload from client and manually pass it to the module to meet your needs.
9696

@@ -276,8 +276,6 @@ This release introduces lots of changes to repository structure and development
276276

277277
- Fixed some bugs.
278278

279-
[module-access-control]: https://github.com/dadish/ProcessGraphQL/tree/master#access-control
279+
[module-access-control]: https://github.com/dadish/ProcessGraphQL/tree/main#access-control
280280
[latest-release]: https://github.com/dadish/ProcessGraphQL/releases/latest
281-
[travis-ci-badge]: https://www.travis-ci.org/dadish/ProcessGraphQL.svg?branch=master
282-
[travis-ci]: https://travis-ci.org/dadish/ProcessGraphQL/
283281
[webonyx/graphql-php]: https://github.com/webonyx/graphql-php

Readme.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Here is an example of ProcessGraphQL in action after installing it to [skyscrape
2424

2525
![ProcessGraphQL Simple Query][img-query]
2626

27-
See more [demo here](https://github.com/dadish/ProcessGraphQL/blob/master/ScreenCast.md).
27+
See more [demo here](https://github.com/dadish/ProcessGraphQL/blob/main/ScreenCast.md).
2828

2929
## Requirements
3030

@@ -277,7 +277,7 @@ then it is probably because ProcessGraphQL is not receiving your query. The reas
277277

278278
## License
279279

280-
[MIT](https://github.com/dadish/ProcessGraphQL/blob/master/LICENSE)
280+
[MIT](https://github.com/dadish/ProcessGraphQL/blob/main/LICENSE)
281281

282282
[graphql]: http://graphql.org/
283283
[graphql-naming]: http://facebook.github.io/graphql/#sec-Names
@@ -287,12 +287,10 @@ then it is probably because ProcessGraphQL is not receiving your query. The reas
287287
[pw-selectors]: https://processwire.com/api/selectors/
288288
[pw-access]: http://processwire.com/api/user-access/
289289
[pw-api-selectors-limit]: https://processwire.com/api/selectors#limit
290-
[img-query]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/master/imgs/ProcessGraphQL-Query.gif
291-
[img-filtering]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/master/imgs/ProcessGraphQL-Filtering.gif
292-
[img-fieldtypes]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/master/imgs/ProcessGraphQL-Fieldtypes.gif
293-
[img-documentation]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/master/imgs/ProcessGraphQL-Documentation.gif
294-
[travis-ci-badge]: https://www.travis-ci.org/dadish/ProcessGraphQL.svg?branch=master
295-
[travis-ci]: https://travis-ci.org/dadish/ProcessGraphQL/
290+
[img-query]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/main/imgs/ProcessGraphQL-Query.gif
291+
[img-filtering]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/main/imgs/ProcessGraphQL-Filtering.gif
292+
[img-fieldtypes]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/main/imgs/ProcessGraphQL-Fieldtypes.gif
293+
[img-documentation]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/main/imgs/ProcessGraphQL-Documentation.gif
296294
[latest-release]: https://github.com/dadish/ProcessGraphQL/releases/latest
297295
[map-marker-graphql]: https://github.com/dadish/GraphQLFieldtypeMapMarker
298296
[webonyx-graphql]: https://github.com/webonyx/graphql-php

ScreenCast.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Documentation for your api is easily accessible via GraphiQL interface.
2020

2121
Learn more from the [documentation](https://github.com/dadish/processgraphql#processgraphql).
2222

23-
[img-query]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/master/imgs/ProcessGraphQL-Query.gif
24-
[img-filtering]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/master/imgs/ProcessGraphQL-Filtering.gif
25-
[img-fieldtypes]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/master/imgs/ProcessGraphQL-Fieldtypes.gif
26-
[img-documentation]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/master/imgs/ProcessGraphQL-Documentation.gif
27-
[img-youtube-thumb]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/master/imgs/thumb.png
23+
[img-query]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/main/imgs/ProcessGraphQL-Query.gif
24+
[img-filtering]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/main/imgs/ProcessGraphQL-Filtering.gif
25+
[img-fieldtypes]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/main/imgs/ProcessGraphQL-Fieldtypes.gif
26+
[img-documentation]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/main/imgs/ProcessGraphQL-Documentation.gif
27+
[img-youtube-thumb]: https://raw.githubusercontent.com/dadish/ProcessGraphQL/main/imgs/thumb.png
2828
[pw-selectors]: https://processwire.com/api/selectors/

scripts/release.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const {
33
extraneousFiles,
44
vendorExtraneousFiles,
55
execute,
6-
updateFile
6+
updateFile,
77
} = require("./commons");
88

99
async function release(releaseLevel) {
@@ -50,18 +50,14 @@ async function release(releaseLevel) {
5050
await execute("git", [
5151
"commit",
5252
"-m",
53-
"Remove extraneous files for release."
53+
"Remove extraneous files for release.",
5454
]);
5555

5656
// version tag
5757
await execute("git", ["tag", `v${releaseLevel}`], "Tagging the release.");
5858

59-
// switch back to master
60-
await execute(
61-
"git",
62-
["checkout", "master"],
63-
"Switching back to master branch."
64-
);
59+
// switch back to main
60+
await execute("git", ["checkout", "main"], "Switching back to main branch.");
6561

6662
// delete the release branch
6763
await execute(
@@ -77,10 +73,10 @@ async function release(releaseLevel) {
7773
await execute(
7874
"npm",
7975
["version", releaseLevel, "--no-git-tag-version"],
80-
"Incrementing the package version on the master branch"
76+
"Incrementing the package version on the main branch"
8177
);
8278

83-
// update the .module file version number on master branch
79+
// update the .module file version number on main branch
8480
await updateFile(
8581
path.resolve(__dirname + "/../ProcessGraphQL.module"),
8682
/\'version\' => \'\d+\.\d+\.\d+(-rc\d+)?\'/,
@@ -92,7 +88,7 @@ async function release(releaseLevel) {
9288
await execute(
9389
"git",
9490
["commit", "--all", "-m", releaseLevel],
95-
"Committing package version update on master branch."
91+
"Committing package version update on main branch."
9692
);
9793
}
9894

0 commit comments

Comments
 (0)