diff --git a/ci/build/npm/build.inc.yml b/ci/build/npm/build.inc.yml index 3be45ef..4e595c5 100644 --- a/ci/build/npm/build.inc.yml +++ b/ci/build/npm/build.inc.yml @@ -11,19 +11,19 @@ build-npm: paths: - node_modules/ script: - # - | - # if [ -f "${CI_PROJECT_DIR}/VERSION" ]; then - # APPVERSION=$(cat ${CI_PROJECT_DIR}/VERSION) - # fi - # echo "APPVERSION(VERSION) ${APPVERSION}" + - | + if [ -f "${CI_PROJECT_DIR}/VERSION" ]; then + APPVERSION=$(cat ${CI_PROJECT_DIR}/VERSION) + fi + echo "APPVERSION(VERSION) ${APPVERSION}" - # if [[ -z "$APPVERSION" ]]; then - # echo "APPVERSION is null" - # exit 1 - # fi - # - echo VITE_VERSION = "$APPVERSION" >> .env + if [[ -z "$APPVERSION" ]]; then + echo "APPVERSION is null" + exit 1 + fi + - echo VITE_VERSION = "$APPVERSION" >> .env - # - export PRODUCT="${PRODUCT_CLOUD}" + - export PRODUCT="${PRODUCT_CLOUD}" - npm install - npm run build diff --git a/ci/rules.yml b/ci/rules.yml index 1b74a07..9849945 100644 --- a/ci/rules.yml +++ b/ci/rules.yml @@ -2,7 +2,7 @@ rules: - if: $CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "merge_request_event" when: never - - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "main" + - if: $CI_PIPELINE_SOURCE == "push" && ($CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "feature/ci") exists: - .npmrc - ./*/.npmrc