diff --git a/.drone.yml b/.drone.yml index 5a9bbc3..12b0000 100644 --- a/.drone.yml +++ b/.drone.yml @@ -69,6 +69,8 @@ steps: - echo "https://$USER:$PASSWD@git.1000my.com" >> ~/.git-credentials - cat ~/.git-credentials - git fetch --tags + - git submodule init + - git submodule update --recursive --remote # - git submodule add -b master https://git.1000my.com/project_runteng/server_iot-common.git # - git mv server_iot-common iot-common # - git submodule sync @@ -84,23 +86,19 @@ steps: pull: if-not-exists # image: registry.k8s.1000my.com/library/node:16.15.0-slim image: registry.cn-hangzhou.aliyuncs.com/qmiot/init:node-14-slim-python2_3 - environment: - USER: - from_secret: gitea_username - PASSWD: - from_secret: gitea_password volumes: - name: node path: /drone/src/node_modules settings: mirror: https://docker.mirrors.ustc.edu.cn commands: - - git config --global credential.helper store - - echo "https://$USER:$PASSWD@git.1000my.com" >> ~/.git-credentials - ln -s /usr/bin/python2 /usr/bin/python - python --version - npm config set registry https://registry.npm.taobao.org - npm config set sass_binary_site https://npm.taobao.org/mirrors/node-sass/ + - cd ./src/qmmap + - npm install + - cd ../../ - npm install - unset CI - npm run build diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..ee1944b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/qmmap"] + path = src/qmmap + url = git@git.1000my.com:common/base_mobile_map_sdk.git diff --git a/src/pages/Index/Index.js b/src/pages/Index/Index.js index a8cda6f..8d95048 100644 --- a/src/pages/Index/Index.js +++ b/src/pages/Index/Index.js @@ -1,5 +1,5 @@ import React, { useState, useEffect, useReducer, useRef } from "react"; -import Qmmap from "qmmap"; +import Qmmap from "../../qmmap"; import { useHistory, useLocation } from "react-router-dom"; import { getMallInfo } from "../../js/helpers/data-helper"; import "./Index.scss"; diff --git a/src/qmmap b/src/qmmap new file mode 160000 index 0000000..4b3ee2c --- /dev/null +++ b/src/qmmap @@ -0,0 +1 @@ +Subproject commit 4b3ee2c866953ff8c7d586a3ab24768f88a945ae