@@ -43,7 +43,7 @@ It is only active for your integration branch (`develop` by default).
...
@@ -43,7 +43,7 @@ It is only active for your integration branch (`develop` by default).
#### Production environments
#### 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),
* a **staging** environment (an iso-prod environment meant for testing and validation purpose),
* the **production** environment.
* the **production** environment.
...
@@ -405,7 +405,7 @@ Here are variables supported to configure the integration environment:
...
@@ -405,7 +405,7 @@ Here are variables supported to configure the integration environment:
### Staging environment configuration
### 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).
The staging environment is an iso-prod environment meant for testing and validation purpose associated to your production branch (`main` or `master` by default).
It is **disabled by default** and can be enabled by setting the `OS_STAGING_PROJECT` variable (see below).
It is **disabled by default** and can be enabled by setting the `OS_STAGING_PROJECT` variable (see below).
...
@@ -421,7 +421,7 @@ Here are variables supported to configure the staging environment:
...
@@ -421,7 +421,7 @@ Here are variables supported to configure the staging environment:
### Production environment configuration
### 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 `OS_PROD_PROJECT` variable (see below).
It is **disabled by default** and can be enabled by setting the `OS_PROD_PROJECT` variable (see below).