Commit 232b18e5 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

docs: main or master as prod branch

parent a9f8d73d

README.md

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ It is only active for your integration branch (`develop` by default). 


#### Production environments



Lastly, the template supports 2 environments associated to your production branch (`master` by default):

Lastly, the template supports 2 environments associated to your production branch (`main` or `master` by default):



* a **staging** environment (an iso-prod environment meant for testing and validation purpose),

* the **production** environment.
@@ -238,7 +238,7 @@ Here are variables supported to configure the integration environment: 
### Staging environment configuration



The staging environment is an iso-prod environment meant for testing and validation purpose associated to your production 

branch (`master` by default).

branch (`main` or `master` by default).



It is **enabled by default** and can be disabled by setting the `S3_STAGING_DISABLED` variable (see below).
@@ -256,7 +256,7 @@ Here are variables supported to configure the staging environment: 


### Production environment configuration



The production environment is the final deployment environment associated with your production branch (`master` by default).

The production environment is the final deployment environment associated with your production branch (`main` or `master` by default).



It is **enabled by default** and can be disabled by setting the `S3_PROD_DISABLED` variable (see below).

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ 
    {

      "id": "staging",

      "name": "Staging",

      "description": "An iso-prod environment meant for testing and validation purpose on your production branch (`master` by default)",

      "description": "An iso-prod environment meant for testing and validation purpose on your production branch (`main` or `master` by default)",

      "disable_with": "S3_STAGING_DISABLED",

      "variables": [

        {