From 2a2a77317409b5a74f31731dfcb8ef91646ae224 Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Fri, 10 Nov 2023 13:38:07 +0100 Subject: [PATCH] chore: rewire some master occurences (#9379) (main for a few in contributing; doesn't exist yet but will, soon) --- .changeset/config.json | 18 +++++++++--------- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- CONTRIBUTING.md | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.changeset/config.json b/.changeset/config.json index 8402de2313..78f066bcad 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -1,11 +1,11 @@ { - "$schema": "https://unpkg.com/@changesets/config@2.3.0/schema.json", - "changelog": ["@svitejs/changesets-changelog-github-compact", { "repo": "sveltejs/svelte" }], - "commit": false, - "fixed": [], - "linked": [], - "access": "public", - "baseBranch": "master", - "bumpVersionsWithWorkspaceProtocolOnly": true, - "ignore": ["!(@sveltejs/*|svelte)"] + "$schema": "https://unpkg.com/@changesets/config@2.3.0/schema.json", + "changelog": ["@svitejs/changesets-changelog-github-compact", { "repo": "sveltejs/svelte" }], + "commit": false, + "fixed": [], + "linked": [], + "access": "public", + "baseBranch": "svelte-4", + "bumpVersionsWithWorkspaceProtocolOnly": true, + "ignore": ["!(@sveltejs/*|svelte)"] } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8e948b3a4..2eb842967a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: CI on: push: - branches: [master] + branches: [svelte-4] pull_request: permissions: contents: read # to fetch code (actions/checkout) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd590aff5f..999f04d80c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: branches: - - master + - svelte-4 permissions: {} jobs: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index beb9e912c3..924a0a752d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -81,7 +81,7 @@ Small pull requests are much easier to review and more likely to get merged. ### Creating a branch -Fork [the repository](https://github.com/sveltejs/svelte) and create your branch from `master`. If you've never sent a GitHub pull request before, you can learn how from [this free video series](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github). +Fork [the repository](https://github.com/sveltejs/svelte) and create your branch from `main`. If you've never sent a GitHub pull request before, you can learn how from [this free video series](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github). ### Testing @@ -130,7 +130,7 @@ Please make sure the following is done when submitting a pull request: 1. Make sure your code lints (`pnpm lint`). 1. Make sure your tests pass (`pnpm test`). -All pull requests should be opened against the `master` branch. Make sure the PR does only one thing, otherwise please split it. +All pull requests should be opened against the `main` branch. Make sure the PR does only one thing, otherwise please split it. #### Breaking changes