From 06efbb17254245cd9271d58321be4871886e92ee Mon Sep 17 00:00:00 2001 From: Mitch Goudy Date: Fri, 5 Apr 2024 14:38:00 -0600 Subject: [PATCH] Update branch name from master to main --- .circleci/config.yml | 4 ++-- README.md | 8 ++++---- package.json | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 81706ad87..c41a7f6f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -109,7 +109,7 @@ workflows: cron: 0 0 * * * filters: branches: - only: master + only: main jobs: - audit-and-notify build_and_test: @@ -130,5 +130,5 @@ workflows: filters: branches: only: - - master + - main - beta diff --git a/README.md b/README.md index c29e62a94..ead7fbe1b 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,12 @@ - Manage spaces - list, create, delete,... - Export your space to a JSON file. - Import your space from a JSON file. -- Execute migration scripts written in the [Contentful Migration DSL](https://github.com/contentful/contentful-migration/blob/master/README.md#reference-documentation) -- Generate migration scripts for the [Contentful Migration DSL](https://github.com/contentful/contentful-migration/blob/master/README.md#reference-documentation) from existing spaces. +- Execute migration scripts written in the [Contentful Migration DSL](https://github.com/contentful/contentful-migration/blob/main/README.md#reference-documentation) +- Generate migration scripts for the [Contentful Migration DSL](https://github.com/contentful/contentful-migration/blob/main/README.md#reference-documentation) from existing spaces. - Seed your space with example data. - Manage installation of [extensions](https://github.com/contentful/extensions) in a space. - Securely login and logout with our [OAuth service](https://www.contentful.com/developers/docs/references/authentication/). -- Find all available commands in the [docs section](https://github.com/contentful/contentful-cli/tree/master/docs). +- Find all available commands in the [docs section](https://github.com/contentful/contentful-cli/tree/main/docs). ## :cloud: Installation @@ -46,7 +46,7 @@ contentful space --help ## :books: Documentation -More detailed documentation for every command can be found in the [docs section](https://github.com/contentful/contentful-cli/tree/master/docs). +More detailed documentation for every command can be found in the [docs section](https://github.com/contentful/contentful-cli/tree/main/docs). ## Using the CLI tool with a proxy diff --git a/package.json b/package.json index acb523092..8e07fd7f7 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "test:e2e": "JEST_SUITE_NAME=\"Unit Tests\" JEST_JUNIT_OUTPUT_NAME=\"e2e-tests.xml\" cross-env jest --testPathPattern=test/e2e --verbose", "postinstall": "patch-package", "precommit": "npm run prettier:write && lint-staged", - "prepush": "jest --changedSince master test/unit/**", + "prepush": "jest --changedSince main test/unit/**", "prepublishOnly": "npm run build:package", "prettier": "prettier --config .prettierrc \"./*.js\" \"{./lib,./test,./docs,.}/**/*.{js,json,md}\"", "prettier:write": "npm run prettier -- --write", @@ -170,7 +170,7 @@ }, "release": { "branches": [ - "master", + "main", { "name": "beta", "channel": "beta",