From ed69bcebc8e05bea4f154bd40308cf96e96459f0 Mon Sep 17 00:00:00 2001
From: mtyszczak <mateusz.tyszczak@gmail.com>
Date: Fri, 21 Feb 2025 16:53:27 +0100
Subject: [PATCH] Move supplement documentation url to the build step
---
.gitlab-ci.yml | 20 ++++++++------------
npm-common-config | 2 +-
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9a46a3..e6e8ada 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
include:
- project: 'hive/common-ci-configuration'
- ref: 417f8021d442a09ca0541aca475d6c2f70f0d9f8
+ ref: baec631dab2578a5a2d1d3aa74cb3e0ca13f12be
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:
@@ -79,6 +73,8 @@ push_to_wiki:
DIST_DIR: "$CI_PROJECT_DIR/dist"
needs:
+ - job: build
+ artifacts: true
- job: generate_docs
artifacts: true
diff --git a/npm-common-config b/npm-common-config
index 417f802..baec631 160000
--- a/npm-common-config
+++ b/npm-common-config
@@ -1 +1 @@
-Subproject commit 417f8021d442a09ca0541aca475d6c2f70f0d9f8
+Subproject commit baec631dab2578a5a2d1d3aa74cb3e0ca13f12be
--
GitLab