Skip to content

Commit 3a2310d

Browse files
committed
Rename master branch to main
1 parent ce0c872 commit 3a2310d

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
77
schedule:
88
- cron: '0 0 * * *'

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ git remote add upstream https://github.com/jolicode/slack-php-api.git
7373
Then get the upstream changes:
7474

7575
```shell
76-
git checkout master
77-
git pull --rebase origin master
78-
git pull --rebase upstream master
76+
git checkout main
77+
git pull --rebase origin main
78+
git pull --rebase upstream main
7979
git checkout <your-branch>
80-
git rebase master
80+
git rebase main
8181
```
8282

8383
Finally, publish your changes:

VERSIONING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ The versioning is inspired by [Semantic Versioning](http://semver.org/):
1717
The branching is inspired by [@jbenet](https://github.com/jbenet)
1818
[simple git branching model](https://gist.github.com/jbenet/ee6c9ac48068889b0912):
1919

20-
> 1. `master` must always be deployable.
20+
> 1. `main` must always be deployable.
2121
> 2. **all changes** are made through feature branches (pull-request + merge)
22-
> 3. rebase to avoid/resolve conflicts; merge in to `master`
22+
> 3. rebase to avoid/resolve conflicts; merge in to `main`

doc/updating-sdk.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ In order to download the latest API specification and apply the patches, you may
1616

1717
This command sequentially runs the following operations:
1818

19-
1. Downloads and saves the current [official Slack OpenAPI specification file](https://api.slack.com/specs/openapi/v2/slack_web.json) in [resources/slack-openapi.json](https://github.com/jolicode/slack-php-api/blob/master/resources/slack-openapi.json)
20-
2. Recursively sorts the JSON keys and saves this intermediate version in [resources/slack-openapi-sorted.json](https://github.com/jolicode/slack-php-api/blob/master/resources/slack-openapi-sorted.json)
21-
3. Applies [our patches](https://github.com/jolicode/slack-php-api/blob/master/resources/slack-openapi-sorted.patch) and stores the resulting specification file in [resources/slack-openapi-patched.json](https://github.com/jolicode/slack-php-api/blob/master/resources/slack-openapi-patched.json)
19+
1. Downloads and saves the current [official Slack OpenAPI specification file](https://api.slack.com/specs/openapi/v2/slack_web.json) in [resources/slack-openapi.json](https://github.com/jolicode/slack-php-api/blob/main/resources/slack-openapi.json)
20+
2. Recursively sorts the JSON keys and saves this intermediate version in [resources/slack-openapi-sorted.json](https://github.com/jolicode/slack-php-api/blob/main/resources/slack-openapi-sorted.json)
21+
3. Applies [our patches](https://github.com/jolicode/slack-php-api/blob/main/resources/slack-openapi-sorted.patch) and stores the resulting specification file in [resources/slack-openapi-patched.json](https://github.com/jolicode/slack-php-api/blob/main/resources/slack-openapi-patched.json)
2222

2323
You can now build a new SDK using this patched specification.
2424

0 commit comments

Comments
 (0)