Commit 5045f39a authored by Pierre SMEYERS's avatar Pierre SMEYERS
Browse files

Merge branch '9-change-variable-behaviour' into 'master' 

feat: Change boolean variable behaviour

Closes #9

See merge request to-be-continuous/angular!2
parents 71f2d224 6b573ea4

README.md

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ This stage is bound to the `test` stage and uses the following variables : 
|----------------------|------------------------------------------------------------|------------------------------------------|

| `NG_E2E_ARGS`        | Angular [ng e2e](https://angular.io/cli/e2e) arguments     | `e2e`                                    |

| `NG_E2E_REPORT_PATH` | path where e2e reports are stored                          | `reports/e2e`                            |

| `NG_E2E_ENABLED`     | enable or not the e2e tests execution                      | *none (disabled by default)*             |

| `NG_E2E_ENABLED`     | set to `true`to enable the e2e tests execution                      | *none (disabled by default)*             |



Implementation rely on the official [Angular CLI](https://cli.angular.io/) tool (`ng build` and `ng test` commands).
@@ -181,7 +181,7 @@ This job is bound to the `publish` stage, and uses the following variable: 


| Name            | description                                                | default value                            |

|-----------------|------------------------------------------------------------|------------------------------------------|

| `NG_PUBLISH_ENABLED`     | Variable to enable the publish job   | none (disabled) |

| `NG_PUBLISH_ENABLED`     | Set variable to `true` to enable the publish job   | none (disabled) |

| `NG_PUBLISH_PROJECTS` | Space separated list of projects to publish | If no project is specified, the value of _angular.json_ `defaultProject` property is used |

| `NG_PUBLISH_ARGS`        | NPM [publish](https://docs.npmjs.com/cli/v6/commands/npm-publish) arguments | `--verbose`          |

| `NPM_PUBLISH_REGISTRY`     | NPM registry to publish to | uses GitLab project npm packages registry  |

templates/gitlab-ci-angular.yml

+3 −3
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ stages: 


  }



  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update angular "1.2.0"; fi

  if [[ "$TEMPLATE_CHECK_UPDATE_DISABLED" != "true" ]]; then check_for_update angular "1.2.0"; fi

  unscope_variables



  # ENDSCRIPT
@@ -493,7 +493,7 @@ ng-e2e: 
  - if: $CI_MERGE_REQUEST_ID

    when: never

  # only run if feature is enabled

  - if: '$NG_E2E_ENABLED'

  - if: '$NG_E2E_ENABLED == "true"'



###############################################################################################

#                                      publish stage:                                         #
@@ -516,5 +516,5 @@ npm-publish: 
    - if: $CI_MERGE_REQUEST_ID

      when: never

    # on production branche: manual

    - if: '$NG_PUBLISH_ENABLED && $CI_COMMIT_REF_NAME =~ $PROD_REF'

    - if: '$NG_PUBLISH_ENABLED == "true" && $CI_COMMIT_REF_NAME =~ $PROD_REF'

      when: manual