Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(core): rename the primary branch to main #1014

Merged
merged 1 commit into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:

env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-editor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name: Deploy Editor
on:
push:
branches:
- master
- main

jobs:

deploy:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ git commit -m 'docs: add details about commitlint in README.md'
To learn more about the commitlint, please visit [conventional-changelog/commitlint](https://github.com/conventional-changelog/commitlint#what-is-commitlint).

## Opening Pull Requests
We use the [commitlint](#commitlint) for the title of PR. So, if the title of PR is not following the commitlint conventions, [Semantic Pull Request](https://github.com/zeke/semantic-pull-requests) will complain about it, disallowing your PR to be merged. When your PR is accepted and merged into the master branch, the title of the PR will be recorded as a single commit message which will then added as a single item in [CHANGELOG.md](/CHANGELOG.md).
We use the [commitlint](#commitlint) for the title of PR. So, if the title of PR is not following the commitlint conventions, [Semantic Pull Request](https://github.com/zeke/semantic-pull-requests) will complain about it, disallowing your PR to be merged. When your PR is accepted and merged into the main branch, the title of the PR will be recorded as a single commit message which will then added as a single item in [CHANGELOG.md](/CHANGELOG.md).

## Testing

Expand Down Expand Up @@ -142,7 +142,7 @@ GitHub Action handles bumping the version of Gosling.js. The pattern looks like

```
pnpm version --patch
git push origin master --tags
git push origin main --tags
```

# Internal Explanations
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ We welcome and greatly appreciate your contribution to this project! Please read

## License

This project is licensed under the terms of the [MIT license](https://github.com/gosling-lang/gosling.js/blob/master/LICENSE.md).
This project is licensed under the terms of the [MIT license](https://github.com/gosling-lang/gosling.js/blob/main/LICENSE.md).
4 changes: 2 additions & 2 deletions editor/Editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1389,7 +1389,7 @@ function Editor(props: RouteComponentProps) {
<br />
<br />
<a
href="https://github.com/gosling-lang/gosling.js/blob/master/CHANGELOG.md"
href="https://github.com/gosling-lang/gosling.js/blob/main/CHANGELOG.md"
target="_blank"
rel="noopener noreferrer"
>
Expand All @@ -1398,7 +1398,7 @@ function Editor(props: RouteComponentProps) {
<br />
<br />
<a
href="https://github.com/gosling-lang/gosling.js/blob/master/LICENSE.md"
href="https://github.com/gosling-lang/gosling.js/blob/main/LICENSE.md"
target="_blank"
rel="noopener noreferrer"
>
Expand Down
2 changes: 1 addition & 1 deletion editor/EditorPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function EditorPanel(props: {
validate: true,
schemas: [
{
uri: 'https://raw.githubusercontent.com/gosling-lang/gosling.js/master/schema/gosling.schema.json',
uri: 'https://raw.githubusercontent.com/gosling-lang/gosling.js/main/schema/gosling.schema.json',
fileMatch: ['*'],
schema: GoslingSchema
}
Expand Down