Skip to content

Commit f2c8153

Browse files
committed
chore(build): activate the CI on push on main
1 parent a78f823 commit f2c8153

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build, Test and Deploy
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- beta
88
pull_request:
99

@@ -68,7 +68,7 @@ jobs:
6868
name: Release
6969
runs-on: ubuntu-latest
7070
needs: [lint, test]
71-
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/beta')
71+
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/beta')
7272
steps:
7373
- uses: actions/checkout@v2
7474
with:

.releaserc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
2+
branches: ['main'],
23
plugins: [
34
[
45
'@semantic-release/commit-analyzer', {

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Forest Admin in Rails
22

33
[![Gem](https://badge.fury.io/rb/forest_liana.svg)](https://badge.fury.io/rb/forest_liana)
4-
[![CI status](https://github.com/ForestAdmin/forest-rails/workflows/Build,%20Test%20and%20Deploy/badge.svg?branch=master)](https://github.com/ForestAdmin/forest-rails/actions)
4+
[![CI status](https://github.com/ForestAdmin/forest-rails/workflows/Build,%20Test%20and%20Deploy/badge.svg?branch=main)](https://github.com/ForestAdmin/forest-rails/actions)
55
[![Test Coverage](https://api.codeclimate.com/v1/badges/959c02b420b455eac51f/test_coverage)](https://codeclimate.com/github/ForestAdmin/forest-rails/test_coverage)
66
[![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)
77

@@ -151,7 +151,7 @@ with an extensive activity log system.
151151

152152
This repository is officially maintained by Forest Admin.
153153
We're always happy to get contributions for other fellow lumberjacks.
154-
All contributions will be reviewed by Forest Admin's team before being merged into master.
154+
All contributions will be reviewed by Forest Admin's team before being merged into main.
155155

156156
Here is the contribution workflow:
157157

commitlint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// NOTICE: When a github "squash and merge" is performed, github add the PR link in the commit
22
// message using the format ` (#<PR_ID>)`. Github provide the target branch of the build,
3-
// so authorizing 4+5 = 9 characters more on master for the max header length should work
3+
// so authorizing 4+5 = 9 characters more on main for the max header length should work
44
// until we reach PR #99999.
55

66
let maxLineLength = 100;

0 commit comments

Comments
 (0)