diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ce57bec56..4499256f7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,13 +1,7 @@ --- name: 'Kitsu CI' -on: - pull_request: - branches: - - master - push: - branches: - - master +on: [push, pull_request] jobs: ci: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bc45a66361..45f0ce5ee9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ name: 'Kitsu release' on: push: branches: - - master + - main tags: - '*' diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index e62c59e044..ae64d72e80 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -3,7 +3,7 @@ name: Deploy Kitsu to staging environment on: push: branches: - - master + - main jobs: build: @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Update Kitsu on staging server - uses: appleboy/ssh-action@v1.0.3 + uses: appleboy/ssh-action@v1 env: HUSKY: 0 NODE_OPTIONS: '--max_old_space_size=8192' diff --git a/README.md b/README.md index 0706df7ace..1736cc827f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ For further information about features and installation, please refer to the ## Contributing There are many ways to contribute to Kitsu, from simple tasks to most complex ones. We created a -[contributing guide](https://github.com/cgwire/kitsu/blob/master/CONTRIBUTING.md) explaining everything. +[contributing guide](https://github.com/cgwire/kitsu/blob/main/CONTRIBUTING.md) explaining everything. You will find all the information you are looking for! ## Sponsors diff --git a/RELEASE.md b/RELEASE.md index c35846f4d1..4090e5e29e 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -3,17 +3,17 @@ We release Kitsu versions through GitHub. Every time a new version is ready, we follow this process: -1. Rebase sources on the `master` branch. +1. Rebase sources on the `main` branch. 2. Up the version number through the `npm` CLI. 3. Tag the commit with the Kitsu version. -4. Push changes to the `master` branch. +4. Push changes to the `main` branch. You can run the following script to perform these commands at once: ```bash -git pull --rebase origin master +git pull --rebase origin main npm version patch -git push origin master --tag +git push origin main --tag ``` # Deployment diff --git a/scripts/release.sh b/scripts/release.sh index 32401ae7d9..aedaf8b942 100644 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,4 +1,4 @@ set -e -git pull --rebase origin master +git pull --rebase origin main npm version patch -git push origin master --tag +git push origin main --tag