From 491f9c44ed16831240dd625a0bad64ecd91edc83 Mon Sep 17 00:00:00 2001 From: Arnaud Besnier Date: Fri, 27 Aug 2021 10:42:44 +0200 Subject: [PATCH] chore(build): activate the CI on push on main --- .github/workflows/build.yml | 4 ++-- .releaserc.js | 9 +++++---- README.md | 2 +- commitlint.config.js | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11e4ee0b1..ae6ff8b14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: Build, Test and Deploy on: push: branches: - - master + - main - beta pull_request: @@ -53,7 +53,7 @@ jobs: name: Release package runs-on: ubuntu-latest needs: [test] - if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/beta') + if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/beta') steps: - uses: actions/checkout@v2 with: diff --git a/.releaserc.js b/.releaserc.js index 961b8f4e1..b9a1e388c 100644 --- a/.releaserc.js +++ b/.releaserc.js @@ -1,4 +1,5 @@ module.exports = { + branches: ['main'], plugins: [ [ '@semantic-release/commit-analyzer', { @@ -54,16 +55,16 @@ module.exports = { [ "semantic-release-npm-deprecate-old-versions", { "rules": [ - { - "rule": "supportLatest", + { + "rule": "supportLatest", "options": { "numberOfMajorReleases": 3, "numberOfMinorReleases": "all", "numberOfPatchReleases": "all" } }, - { - "rule": "supportPreReleaseIfNotReleased", + { + "rule": "supportPreReleaseIfNotReleased", "options": { "numberOfPreReleases": 1, } diff --git a/README.md b/README.md index 680130fe3..a72b341fa 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Forest Express Lianas dependency [![npm package](https://badge.fury.io/js/forest-express.svg)](https://badge.fury.io/js/forest-express) -[![CI status](https://github.com/ForestAdmin/forest-express/workflows/Build,%20Test%20and%20Deploy/badge.svg?branch=master)](https://github.com/ForestAdmin/forest-express/actions) +[![CI status](https://github.com/ForestAdmin/forest-express/workflows/Build,%20Test%20and%20Deploy/badge.svg?branch=main)](https://github.com/ForestAdmin/forest-express/actions) [![Test Coverage](https://api.codeclimate.com/v1/badges/760886d5e81ea4095e90/test_coverage)](https://codeclimate.com/github/ForestAdmin/forest-express/test_coverage) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) diff --git a/commitlint.config.js b/commitlint.config.js index 055204599..d42b85fae 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1,6 +1,6 @@ // NOTICE: When a github "squash and merge" is performed, github add the PR link in the commit // message using the format ` (#)`. Github provide the target branch of the build, -// so authorizing 4+5 = 9 characters more on master for the max header length should work +// so authorizing 4+5 = 9 characters more on main for the max header length should work // until we reach PR #99999. let maxLineLength = 100;