Compare commits

...

7 Commits

Author SHA1 Message Date
黄敏豪 1d86164386 Merge pull request 'feat: merge test' (#5) from test into master 3 years ago
jiannibang d00fd95bd9 merge dev 3 years ago
jiannibang ef1c20adfa feat: 重新使用submodule 3 years ago
jiannibang 8b2121915f feat: 删除qmmap 3 years ago
jiannibang 0343fec2dc feat: 移除submodules 3 years ago
jiannibang 4bcbe63052 feat: 更新submodule生成方式 3 years ago
jiannibang 93a768febe feat: 恢复submodules 3 years ago
  1. 12
      .drone.yml
  2. 3
      .gitmodules
  3. 2
      src/pages/Index/Index.js
  4. 1
      src/qmmap

12
.drone.yml

@ -69,6 +69,8 @@ steps:
- echo "https://$USER:$PASSWD@git.1000my.com" >> ~/.git-credentials - echo "https://$USER:$PASSWD@git.1000my.com" >> ~/.git-credentials
- cat ~/.git-credentials - cat ~/.git-credentials
- git fetch --tags - 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 submodule add -b master https://git.1000my.com/project_runteng/server_iot-common.git
# - git mv server_iot-common iot-common # - git mv server_iot-common iot-common
# - git submodule sync # - git submodule sync
@ -84,23 +86,19 @@ steps:
pull: if-not-exists pull: if-not-exists
# image: registry.k8s.1000my.com/library/node:16.15.0-slim # image: registry.k8s.1000my.com/library/node:16.15.0-slim
image: registry.cn-hangzhou.aliyuncs.com/qmiot/init:node-14-slim-python2_3 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: volumes:
- name: node - name: node
path: /drone/src/node_modules path: /drone/src/node_modules
settings: settings:
mirror: https://docker.mirrors.ustc.edu.cn mirror: https://docker.mirrors.ustc.edu.cn
commands: commands:
- git config --global credential.helper store
- echo "https://$USER:$PASSWD@git.1000my.com" >> ~/.git-credentials
- ln -s /usr/bin/python2 /usr/bin/python - ln -s /usr/bin/python2 /usr/bin/python
- python --version - python --version
- npm config set registry https://registry.npm.taobao.org - npm config set registry https://registry.npm.taobao.org
- npm config set sass_binary_site https://npm.taobao.org/mirrors/node-sass/ - npm config set sass_binary_site https://npm.taobao.org/mirrors/node-sass/
- cd ./src/qmmap
- npm install
- cd ../../
- npm install - npm install
- unset CI - unset CI
- npm run build - npm run build

3
.gitmodules

@ -0,0 +1,3 @@
[submodule "src/qmmap"]
path = src/qmmap
url = https://git.1000my.com/common/base_mobile_map_sdk.git

2
src/pages/Index/Index.js

@ -1,5 +1,5 @@
import React, { useState, useEffect, useReducer, useRef } from "react"; import React, { useState, useEffect, useReducer, useRef } from "react";
import Qmmap from "qmmap";
import Qmmap from "../../qmmap";
import { useHistory, useLocation } from "react-router-dom"; import { useHistory, useLocation } from "react-router-dom";
import { getMallInfo } from "../../js/helpers/data-helper"; import { getMallInfo } from "../../js/helpers/data-helper";
import "./Index.scss"; import "./Index.scss";

1
src/qmmap

@ -0,0 +1 @@
Subproject commit 4b3ee2c866953ff8c7d586a3ab24768f88a945ae
Loading…
Cancel
Save