diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9809a7afa41d45c92f2d9df7e6834238bc11d98..ed7b24af6c03bc98ac11950cc69182f3987b28ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,69 +8,66 @@ variables: CLI_VERSION: latest image: node:14 -#image: node:14:alpine3.13 -cache: - key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR - paths: - - node_modules/ #----------------------------------------------------------------------------------------------------------------------- stages: - - install_dependencies - build - test - sonarqube - dockerimage-ext-job + #----------------------------------------------------------------------------------------------------------------------- -install_dependencies: +.cache: #----------------------------------------------------------------------------------------------------------------------- - stage: install_dependencies + stage: Cache cache: - key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR + key: + files: + - package-lock.json + prefix: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR paths: - node_modules/ - script: - - npm ci - # only: - # changes: - # - package-lock.json + + +#----------------------------------------------------------------------------------------------------------------------- +.install_dependencies: +#----------------------------------------------------------------------------------------------------------------------- + stage: Install_dependencies + extends: .cache + before_script: + - echo "Pipeline ID = $CI_PIPELINE_ID" + - echo "Project name = $CI_PROJECT_NAME" + - echo "Build ref = $CI_BUILD_REF_NAME" + - echo "CI_COMMIT_REF_SLUG = $CI_COMMIT_REF_SLUG" + - echo "CI_PROJECT_DIR = $CI_PROJECT_DIR" + - test -d "node_modules" && echo "Found/Exists" || echo "Does not exist" + - | + if [[ ! -d node_modules ]]; then + npm ci --cache .npm --prefer-offline + fi + #----------------------------------------------------------------------------------------------------------------------- build: #----------------------------------------------------------------------------------------------------------------------- stage: build - dependencies: - - install_dependencies - cache: - key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR - paths: - - node_modules/ - policy: pull + extends: .install_dependencies script: - npm run build artifacts: paths: - dist/ - before_script: - - echo "Pipeline ID = $CI_PIPELINE_ID" - - echo "Project name = $CI_PROJECT_NAME" - - echo "Build ref = $CI_BUILD_REF_NAME" - - echo "CI_COMMIT_REF_SLUG = $CI_COMMIT_REF_SLUG" - - echo "CI_PROJECT_DIR = $CI_PROJECT_DIR" + #----------------------------------------------------------------------------------------------------------------------- test:karma: #----------------------------------------------------------------------------------------------------------------------- stage: test + extends: .cache image: trion/ng-cli-karma:${CLI_VERSION} allow_failure: false - cache: - key: $CI_COMMIT_REF_SLUG-$CI_PROJECT_DIR - paths: - - node_modules/ - policy: pull script: - ./node_modules/@angular/cli/bin/ng test --code-coverage --progress false --watch false coverage: '/Lines \W+: (\d+\.\d+)%.*/' @@ -78,6 +75,7 @@ test:karma: paths: - coverage/ + #----------------------------------------------------------------------------------------------------------------------- sonarqube: #----------------------------------------------------------------------------------------------------------------------- @@ -96,9 +94,13 @@ sonarqube: dependencies: - test:karma + +#----------------------------------------------------------------------------------------------------------------------- +# external Stage (Dockerimage) +#----------------------------------------------------------------------------------------------------------------------- staging-external: stage: dockerimage-ext-job trigger: openkonsequenz/coremodules/portal/portal-build-job variables: ARTIFACTS_DOWNLOAD_REF: $CI_COMMIT_BRANCH - CI_COMMIT_SHORT_SHA_CHILD: $CI_COMMIT_SHORT_SHA \ No newline at end of file + CI_COMMIT_SHORT_SHA_CHILD: $CI_COMMIT_SHORT_SHA diff --git a/src/assets/img/bebtriebstagebuch_kachel.jpg b/src/assets/img/bebtriebstagebuch_kachel.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b6b0ab854a81c8d4b711bcde78316d624f605ac1 Binary files /dev/null and b/src/assets/img/bebtriebstagebuch_kachel.jpg differ