From cea4453e8600eb417911851d10dbd7d2ad0a2d95 Mon Sep 17 00:00:00 2001 From: sehilyi Date: Fri, 15 Dec 2023 13:51:07 -0500 Subject: [PATCH] chore(core): rename the primary branch to main --- .github/workflows/ci.yml | 2 +- .github/workflows/deploy-editor.yml | 4 ++-- CONTRIBUTING.md | 4 ++-- README.md | 2 +- editor/Editor.tsx | 4 ++-- editor/EditorPanel.tsx | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1bd5110..40308274 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - main pull_request: env: diff --git a/.github/workflows/deploy-editor.yml b/.github/workflows/deploy-editor.yml index 58d21e7c..34f6606e 100644 --- a/.github/workflows/deploy-editor.yml +++ b/.github/workflows/deploy-editor.yml @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8190e7a2..403dabd2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -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 diff --git a/README.md b/README.md index 16585d56..a534009d 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/editor/Editor.tsx b/editor/Editor.tsx index 5de59423..8ce1de99 100644 --- a/editor/Editor.tsx +++ b/editor/Editor.tsx @@ -1389,7 +1389,7 @@ function Editor(props: RouteComponentProps) {

@@ -1398,7 +1398,7 @@ function Editor(props: RouteComponentProps) {

diff --git a/editor/EditorPanel.tsx b/editor/EditorPanel.tsx index c40fbce1..fbebafc3 100644 --- a/editor/EditorPanel.tsx +++ b/editor/EditorPanel.tsx @@ -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 }