Skip to content
Snippets Groups Projects

Use common CI configuration scripts and configs

Merged Mateusz Tyszczak requested to merge tm-use-common-ci-conf-2 into main
2 files
+ 11
24
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 10
23
@@ -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: generate_docs
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
Loading