diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b9731cd..7004db5e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,10 +98,10 @@ ui-chrome: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" when: never - - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") + - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "main") when: always allow_failure: false - - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") + - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "main") when: never ui-firefox: @@ -109,10 +109,10 @@ ui-firefox: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" when: never - - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") + - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "main") when: always allow_failure: false - - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") + - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "main") when: never e2e-chrome: @@ -121,9 +121,9 @@ e2e-chrome: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" when: never - - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") + - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "main") when: never - - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") + - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "main") when: manual allow_failure: false @@ -133,9 +133,9 @@ e2e-firefox: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" when: never - - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master") + - if: ($CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "main") when: never - - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master") + - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "main") when: manual allow_failure: false @@ -160,7 +160,7 @@ pages: - npm run documentation - mv docs public only: - - master + - main except: - schedules artifacts: @@ -179,7 +179,7 @@ review: url: https://$CI_PROJECT_PATH_SLUG-$CI_ENVIRONMENT_SLUG.surge.sh/ on_stop: stop_review rules: - - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train" && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web")) + - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "main" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train" && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web")) stop_review: stage: deploy @@ -190,7 +190,7 @@ stop_review: name: review/$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_NAME action: stop rules: - - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "master" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train" && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web")) + - if: ($CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_NAME != "main" && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train" && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web")) staging: stage: deploy @@ -216,6 +216,6 @@ production_demo: name: production url: https://$CI_PROJECT_PATH_SLUG.surge.sh/ only: - - master + - main except: - schedules diff --git a/README.md b/README.md index 17e605a2..93e6be4e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # @openstapps/app -[![pipeline status](https://img.shields.io/gitlab/pipeline/openstapps/app.svg?style=flat-square)](https://gitlab.com/openstapps/app/commits/master) +[![pipeline status](https://img.shields.io/gitlab/pipeline/openstapps/app.svg?style=flat-square)](https://gitlab.com/openstapps/app/commits/main) [![documentation](https://img.shields.io/badge/documentation-online-blue.svg?style=flat-square)](https://openstapps.gitlab.io/app) This is a hybrid mobile app which is built using [Ionic](https://github.com/ionic-team/ionic) and [Angular] (https://angular.io/).