Commit 470550f5 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

docs: main or master

parent 9a0e1c2a

README.md

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,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.
@@ -380,7 +380,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 **disabled by default** and can be enabled by setting the `TF_STAGING_ENABLED` variable (see below).
@@ -399,7 +399,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 **disabled by default** and can be enabled by setting the `TF_PROD_ENABLED` variable (see below).

kicker.json

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,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)",

      "enable_with": "TF_STAGING_ENABLED",

      "variables": [

        {