Commit 71c57d9f authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

docs: main or master as prod branch

parent 482e2ede

{{cookiecutter.project_slug}}/README.md

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,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 `{{cookiecutter.template_PREFIX}}_STAGING_PROJECT` variable (see below).
@@ -368,7 +368,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 `{{cookiecutter.template_PREFIX}}_PROD_PROJECT` variable (see below).

{{cookiecutter.project_slug}}/kicker.json

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

      "variables": [

        {

          "name": "{{cookiecutter.template_PREFIX}}_STAGING_PROJECT",

{{cookiecutter.project_slug}}/templates/gitlab-ci-{{cookiecutter.project_slug}}.yml

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ stages: 
    else

      echo "$environment_url" > environment_url.txt

    fi

    echo -e "environment_type=$environment_type\\nenvironment_name=$environment_name\\nenvironment_url=$environment_url" > {{ cookiecutter.project_slug }}.env

    echo -e "environment_type=$environment_type\\nenvironment_name=$environment_name\\nenvironment_url=$environment_url" >> {{ cookiecutter.project_slug }}.env

  }



  # environment cleanup function