diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9a46a3d3ebb274b808af220a1bf36963016092f..d0d7fd0efcad1c0c8c713ebfe5cfc6e5808065dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: include: - project: 'hive/common-ci-configuration' - ref: 417f8021d442a09ca0541aca475d6c2f70f0d9f8 + ref: 0b70047bcc26560595d51b96b14a3d16ced511af file: - '/templates/npm_projects.gitlab-ci.yml' @@ -25,13 +25,7 @@ lint: script: - npm run lint-ci -supplement_documentation_url: - stage: .pre - extends: .npm_generate_doc_url - variables: - REPLACE_ENV_NAME: "GEN_DOC_URL" - REPLACE_FILE_PATH: "${CI_PROJECT_DIR}/README.md" - +# Builds and supplements wiki URL so it is available in Wiki and published package README build: stage: build extends: .npm_build_template @@ -39,12 +33,12 @@ build: DIST_DIR: "$CI_PROJECT_DIR/dist" NPM_PACKAGE_SCOPE: "@hiveio" NPM_PACKAGE_NAME: "workerbee" + REPLACE_DOC_URL_ENV: "GEN_DOC_URL" + REPLACE_FILE_PATH: "${CI_PROJECT_DIR}/README.md" needs: - job: lint - - job: supplement_documentation_url - artifacts: true -# Generates documentation and supplements wiki URL so it is available in Wiki and published package README +# Generates documentation generate_docs: stage: build extends: .npm_based_job_base @@ -53,7 +47,7 @@ generate_docs: script: - scripts/generate_api_docs.sh "${CI_PROJECT_URL}" "${CI_COMMIT_SHA}" needs: - - job: supplement_documentation_url + - job: build artifacts: true artifacts: paths: diff --git a/npm-common-config b/npm-common-config index 417f8021d442a09ca0541aca475d6c2f70f0d9f8..0b70047bcc26560595d51b96b14a3d16ced511af 160000 --- a/npm-common-config +++ b/npm-common-config @@ -1 +1 @@ -Subproject commit 417f8021d442a09ca0541aca475d6c2f70f0d9f8 +Subproject commit 0b70047bcc26560595d51b96b14a3d16ced511af