Prepare switch to main instead of master

This commit is contained in:
Alexandre Bodin 2022-08-08 15:06:02 +02:00
parent 840391f541
commit a90d53db4c
13 changed files with 15 additions and 29 deletions

View File

@ -13,7 +13,7 @@ https://guides.github.com/features/mastering-markdown/
Please ensure you have also read and understand the contributing guide. Please ensure you have also read and understand the contributing guide.
https://github.com/strapi/strapi/blob/master/CONTRIBUTING.md#reporting-an-issue https://github.com/strapi/strapi/blob/main/CONTRIBUTING.md#reporting-an-issue
--> -->
## Bug report ## Bug report

View File

@ -8,7 +8,7 @@ To help us merge your PR, make sure to follow the instructions below:
- Refer to the issue you are closing in the PR description: Fix #issue - Refer to the issue you are closing in the PR description: Fix #issue
- Specify if the PR is ready to be merged or work in progress (by opening a draft PR) - Specify if the PR is ready to be merged or work in progress (by opening a draft PR)
Please ensure you read the Contributing Guide: https://github.com/strapi/strapi/blob/master/CONTRIBUTING.md Please ensure you read the Contributing Guide: https://github.com/strapi/strapi/blob/main/CONTRIBUTING.md
--> -->
### What does it do? ### What does it do?

View File

@ -1,6 +1,6 @@
# PR checker for status # PR checker for status
This action checks a PR labels, milestone and status to validate it is ready for merging into master. This action checks a PR labels, milestone and status to validate it is ready for merging into main.
> ❗️ When making changes to this code, make sure to run the build before committing. See [Development](#development) to know more. > ❗️ When making changes to this code, make sure to run the build before committing. See [Development](#development) to know more.

View File

@ -9,7 +9,7 @@ on:
- labeled - labeled
- unlabeled - unlabeled
branches: branches:
- master - main
jobs: jobs:
check-pr-status: check-pr-status:

View File

@ -3,7 +3,7 @@ name: 'Tests'
on: on:
push: push:
branches: branches:
- master - main
pull_request: pull_request:
jobs: jobs:

View File

@ -1,10 +0,0 @@
trigger_deploy:
stage: deploy
script:
- curl -X POST
--form "token=$TRIGGER_TOKEN"
--form "ref=master"
--form "variables[UPSTREAM_COMMIT_SHA]=$CI_COMMIT_SHA"
https://gitlab.com/api/v4/projects/12825884/trigger/pipeline
only:
- develop

View File

@ -1,6 +1,6 @@
# Contribute to Strapi # Contribute to Strapi
Strapi is an open-source project administered by [the Strapi team](https://strapi.io/about-us). We appreciate your interest and efforts to contribute to Strapi. See the [LICENSE](https://github.com/strapi/strapi/blob/master/LICENSE) licensing information. All work done is available on GitHub. Strapi is an open-source project administered by [the Strapi team](https://strapi.io/about-us). We appreciate your interest and efforts to contribute to Strapi. See the [LICENSE](https://github.com/strapi/strapi/blob/main/LICENSE) licensing information. All work done is available on GitHub.
We highly appreciate your effort to contribute, but we recommend you talk to a maintainer before spending a lot of time making a pull request that may not align with the project roadmap. Whether it is from Strapi or contributors, every pull request goes through the same process. We highly appreciate your effort to contribute, but we recommend you talk to a maintainer before spending a lot of time making a pull request that may not align with the project roadmap. Whether it is from Strapi or contributors, every pull request goes through the same process.
@ -51,7 +51,7 @@ The Strapi core team will review your pull request and either merge it, request
**Before submitting your pull request** make sure the following requirements are fulfilled: **Before submitting your pull request** make sure the following requirements are fulfilled:
- Fork the repository and create your new branch from `master`. - Fork the repository and create your new branch from `main`.
- Run `yarn setup` in the root of the repository. - Run `yarn setup` in the root of the repository.
- If you've fixed a bug or added code that should be tested, please make sure to add tests - If you've fixed a bug or added code that should be tested, please make sure to add tests
- Ensure the following test suites are passing: - Ensure the following test suites are passing:

View File

@ -17,7 +17,7 @@
<img src="https://img.shields.io/npm/v/@strapi/strapi/latest.svg" alt="NPM Version" /> <img src="https://img.shields.io/npm/v/@strapi/strapi/latest.svg" alt="NPM Version" />
</a> </a>
<a href="https://github.com/strapi/strapi/actions/workflows/tests.yml"> <a href="https://github.com/strapi/strapi/actions/workflows/tests.yml">
<img src="https://github.com/strapi/strapi/actions/workflows/tests.yml/badge.svg?branch=master" alt="Tests" /> <img src="https://github.com/strapi/strapi/actions/workflows/tests.yml/badge.svg?branch=main" alt="Tests" />
</a> </a>
<a href="https://discord.strapi.io"> <a href="https://discord.strapi.io">
<img src="https://img.shields.io/discord/811989166782021633?label=Discord" alt="Strapi on Discord" /> <img src="https://img.shields.io/discord/811989166782021633?label=Discord" alt="Strapi on Discord" />

View File

@ -1,7 +1,6 @@
comment: comment:
branches: branches:
- master - main
- develop
github_checks: github_checks:
annotations: false annotations: false

View File

@ -32,7 +32,7 @@ const config = {
docs: { docs: {
routeBasePath: '/', routeBasePath: '/',
sidebarPath: require.resolve('./sidebars.js'), sidebarPath: require.resolve('./sidebars.js'),
// editUrl: 'https://github.com/strapi/strapi/tree/master/docs//docs', // editUrl: 'https://github.com/strapi/strapi/tree/main/docs//docs',
}, },
blog: false, blog: false,
}, },

View File

@ -13,7 +13,7 @@
<img src="https://img.shields.io/npm/v/@strapi/strapi/latest.svg" alt="NPM Version" /> <img src="https://img.shields.io/npm/v/@strapi/strapi/latest.svg" alt="NPM Version" />
</a> </a>
<a href="https://github.com/strapi/strapi/actions/workflows/tests.yml"> <a href="https://github.com/strapi/strapi/actions/workflows/tests.yml">
<img src="https://github.com/strapi/strapi/actions/workflows/tests.yml/badge.svg?branch=master" alt="Tests" /> <img src="https://github.com/strapi/strapi/actions/workflows/tests.yml/badge.svg?branch=main" alt="Tests" />
</a> </a>
<a href="https://discord.strapi.io"> <a href="https://discord.strapi.io">
<img src="https://img.shields.io/discord/811989166782021633?label=Discord" alt="Strapi on Discord" /> <img src="https://img.shields.io/discord/811989166782021633?label=Discord" alt="Strapi on Discord" />

View File

@ -1,10 +1,7 @@
# strapi-utils # strapi-utils
[![npm version](https://img.shields.io/npm/v/strapi-utils.svg)](https://www.npmjs.org/package/strapi-utils) [![npm version](https://img.shields.io/npm/v/@strapi/utils.svg)](https://www.npmjs.org/package/@strapi/utils)
[![npm downloads](https://img.shields.io/npm/dm/strapi-utils.svg)](https://www.npmjs.org/package/strapi-utils) [![npm downloads](https://img.shields.io/npm/dm/@strapi/utils.svg)](https://www.npmjs.org/package/@strapi/utils)
[![npm dependencies](https://david-dm.org/strapi/strapi-utils.svg)](https://david-dm.org/strapi/strapi-utils)
[![Build status](https://travis-ci.org/strapi/strapi-utils.svg?branch=master)](https://travis-ci.org/strapi/strapi-utils)
[![Slack status](https://slack.strapi.io/badge.svg)](https://slack.strapi.io)
Shared utilities between Strapi packages. Shared utilities between Strapi packages.

View File

@ -13,8 +13,8 @@ read -r version
# publish packages # publish packages
./node_modules/.bin/lerna publish --no-push --force-publish --dist-tag latest --exact "$version" ./node_modules/.bin/lerna publish --no-push --force-publish --dist-tag latest --exact "$version"
# push master branch # push main branch
git push origin master git push origin main
# push tag # push tag
git push origin v"$version" git push origin v"$version"