diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68ae3f092e5507b272d54c19412ca969b57952d6..2ea2d1c14a81c56b27a8107ac8879e3e1fa32a0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: include: - project: 'hive/common-ci-configuration' - ref: fae6329387a55aee40c3760a9af95a7705644bf0 + ref: b38114e281ccb5ad68a7f08461d4b735e6726e76 file: - '/templates/npm_projects.gitlab-ci.yml' @@ -73,25 +73,9 @@ test: push_to_wiki: extends: .npm_push_doc_template stage: deploy - variables: - WIKI_PUSH_TOKEN: "$WIKI_PUSH_TOKEN" - DIST_DIR: "$CI_PROJECT_DIR/dist" - - needs: - - job: generate_docs - artifacts: true - -supplement_documentation_url: - extends: .npm_process_built_package_tarball - stage: deploy - needs: - - job: build - artifacts: true - - job: push_to_wiki - artifacts: true - variables: PACKAGE_TGZ_PATH: "${BUILT_PACKAGE_PATH}" + WIKI_PUSH_TOKEN: "$WIKI_PUSH_TOKEN" DIST_DIR: "$CI_PROJECT_DIR/dist" script: @@ -105,6 +89,12 @@ supplement_documentation_url: BUILT_PACKAGE_NAME=$(jq -r .[].filename "${DIST_DIR}/built_package_info.json") echo BUILT_PACKAGE_PATH="${DIST_DIR}/${BUILT_PACKAGE_NAME}" > built_package_info.env + needs: + - job: build + artifacts: true + - job: push_to_wiki + artifacts: true + artifacts: reports: dotenv: @@ -113,9 +103,6 @@ supplement_documentation_url: paths: - "${DIST_DIR}/*.tgz" # Built package - when: always - expire_in: 1 week - deploy_dev_package: stage: deploy extends: .npm_deploy_package_template @@ -125,7 +112,7 @@ deploy_dev_package: needs: - job: lint - job: test - - job: supplement_documentation_url + - job: push_to_wiki artifacts: true deploy_production_public_npm: @@ -142,5 +129,5 @@ deploy_production_public_npm: needs: - job: lint - job: test - - job: supplement_documentation_url + - job: push_to_wiki artifacts: true diff --git a/npm-common-config b/npm-common-config index 809760aa908707f808b3d49a916e8c7260672cf6..b38114e281ccb5ad68a7f08461d4b735e6726e76 160000 --- a/npm-common-config +++ b/npm-common-config @@ -1 +1 @@ -Subproject commit 809760aa908707f808b3d49a916e8c7260672cf6 +Subproject commit b38114e281ccb5ad68a7f08461d4b735e6726e76