From 96f8751d8a977f59f52ab0844648c4f0e67c494c Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Mon, 16 Dec 2024 17:01:28 +0800 Subject: [PATCH 1/2] feat: ci --- .drone.yml | 130 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 96 insertions(+), 34 deletions(-) diff --git a/.drone.yml b/.drone.yml index 785cb02..f7394bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,8 +15,6 @@ trigger: - dev event: - push -environment: - a: 1 volumes: - name: dockersock host: @@ -24,9 +22,6 @@ volumes: - name: node host: path: /data/drone/node_modules-project-iot-qmgo - - name: localtime - host: - path: /etc/localtime steps: # 从dev合并到test 从dev合并到master - name: 生成Release版本 @@ -34,40 +29,38 @@ steps: # image: exment/drone-semantic-release:latest image: registry.cn-hangzhou.aliyuncs.com/tgabc-namespace/tgabc:semantic-release-v21.0.1 environment: - # GOOS: linux GITEA_TOKEN: - from_secret: gitea_token - # command: [ "--tagFormat", "test_${version}" ] + from_secret: "gitea_token" + USER: + from_secret: "gitea_username" + PASSWD: + from_secret: "gitea_password" + obs_key: + from_secret: "obs_key" + obs_secret: + from_secret: "obs_secret" settings: git_login: from_secret: gitea_username git_password: from_secret: gitea_password - # - name: test分支获取master信息 - # image: alpine/git:v2.36.2 - # commands: - # - git fetch origin test - # - git checkout test - # - git merge origin/master - # - git commit --amend -m "[skip ci]从master合并历史到test" - # - git branch --set-upstream-to=origin/test test - # - git pull - # - git push --set-upstream origin test - # - git checkout master - # when: - # branch: - # - master - name: 获取tag数据 image: alpine/git:v2.36.2 environment: + GITEA_TOKEN: + from_secret: "gitea_token" USER: - from_secret: gitea_username + from_secret: "gitea_username" PASSWD: - from_secret: gitea_password + from_secret: "gitea_password" + obs_key: + from_secret: "obs_key" + obs_secret: + from_secret: "obs_secret" commands: - git config --global credential.helper store - echo "https://$USER:$PASSWD@git.1000my.com" >> ~/.git-credentials - - cat ~/.git-credentials + - env - git fetch --tags - git submodule init - git submodule update --recursive --remote @@ -85,6 +78,18 @@ steps: - name: 代码构建 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: + GITEA_TOKEN: + from_secret: "gitea_token" + USER: + from_secret: "gitea_username" + PASSWD: + from_secret: "gitea_password" + obs_key: + from_secret: "obs_key" + obs_secret: + from_secret: "obs_secret" volumes: - name: node path: /drone/src/node_modules @@ -108,15 +113,22 @@ steps: pull: if-not-exists image: registry.cn-hangzhou.aliyuncs.com/qmiot/init:mysqlinit-base-python environment: + GITEA_TOKEN: + from_secret: "gitea_token" + USER: + from_secret: "gitea_username" + PASSWD: + from_secret: "gitea_password" obs_key: - from_secret: obs_key + from_secret: "obs_key" obs_secret: - from_secret: obs_secret + from_secret: "obs_secret" + cdn_url: https://qianmu-iot.1000my.com/ commands: # - sed -i "s@https://.*"@https://iot-${DRONE_BRANCH}.123.1000my.com"@" build/public/config.json - obsutil config -i=$obs_key -k=$obs_secret -e=obs.cn-east-2.myhuaweicloud.com - - obsutil mkdir obs://qianmu-iot/base_qmgo_react-${DRONE_BRANCH}/ - - obsutil cp -r -f -flat build obs://qianmu-iot/base_qmgo_react-${DRONE_BRANCH}/ + - obsutil mkdir obs://qianmu-iot/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}-${DRONE_BRANCH}/ + - obsutil cp -r -f -flat build obs://qianmu-iot/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}-${DRONE_BRANCH}/ when: branch: - dev @@ -125,15 +137,65 @@ steps: pull: if-not-exists image: registry.cn-hangzhou.aliyuncs.com/qmiot/init:mysqlinit-base-python environment: + GITEA_TOKEN: + from_secret: "gitea_token" + USER: + from_secret: "gitea_username" + PASSWD: + from_secret: "gitea_password" obs_key: - from_secret: obs_key + from_secret: "obs_key" obs_secret: - from_secret: obs_secret + from_secret: "obs_secret" + cdn_url: https://qianmu-iot.1000my.com/ commands: # - sed -i "s@https://.*"@https://iot.1000my.com"@" build/public/config.json - obsutil config -i=$obs_key -k=$obs_secret -e=obs.cn-east-2.myhuaweicloud.com - - obsutil mkdir obs://qianmu-iot/base_qmgo_react/ - - obsutil cp -r -f -flat build obs://qianmu-iot/base_qmgo_react/ + - obsutil mkdir obs://qianmu-iot/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}/ + - obsutil cp -r -f -flat build obs://qianmu-iot/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}/ + when: + branch: + - master + - name: cdn缓存刷新dev test + pull: if-not-exists + image: registry.cn-hangzhou.aliyuncs.com/qmiot/init:qmugo_cdn_flush + environment: + GITEA_TOKEN: + from_secret: "gitea_token" + USER: + from_secret: "gitea_username" + PASSWD: + from_secret: "gitea_password" + obs_key: + from_secret: "obs_key" + obs_secret: + from_secret: "obs_secret" + cdn_url: https://qianmu-iot.1000my.com/ + commands: + - export cdn_url=https://qianmu-iot.1000my.com/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}-${DRONE_BRANCH}/ + - /cdn.bin + when: + branch: + - dev + - test + - name: cdn缓存刷新 master + pull: if-not-exists + image: registry.cn-hangzhou.aliyuncs.com/qmiot/init:qmugo_cdn_flush + environment: + GITEA_TOKEN: + from_secret: "gitea_token" + USER: + from_secret: "gitea_username" + PASSWD: + from_secret: "gitea_password" + obs_key: + from_secret: "obs_key" + obs_secret: + from_secret: "obs_secret" + cdn_url: https://qianmu-iot.1000my.com/ + commands: + - export cdn_url=https://qianmu-iot.1000my.com/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}/ + - /cdn.bin when: branch: - master @@ -157,4 +219,4 @@ steps: failure_pic: "https://raw.githubusercontent.com/Ethan-Liuu/picture/master/failed.png" tpl: "http://get.k8s.1000my.com/.shell/.tpl" when: - status: [failure, success] + status: [failure, success] \ No newline at end of file From dfdde5c0bf4fc82351b9b6ee18d3c0ee56ced260 Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Mon, 16 Dec 2024 17:05:44 +0800 Subject: [PATCH 2/2] feat: ci --- .drone.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index f7394bc..5f28874 100644 --- a/.drone.yml +++ b/.drone.yml @@ -127,8 +127,8 @@ steps: commands: # - sed -i "s@https://.*"@https://iot-${DRONE_BRANCH}.123.1000my.com"@" build/public/config.json - obsutil config -i=$obs_key -k=$obs_secret -e=obs.cn-east-2.myhuaweicloud.com - - obsutil mkdir obs://qianmu-iot/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}-${DRONE_BRANCH}/ - - obsutil cp -r -f -flat build obs://qianmu-iot/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}-${DRONE_BRANCH}/ + - obsutil mkdir obs://qianmu-iot/${DRONE_REPO_NAME}-${DRONE_BRANCH}/ + - obsutil cp -r -f -flat build obs://qianmu-iot/${DRONE_REPO_NAME}-${DRONE_BRANCH}/ when: branch: - dev @@ -151,8 +151,8 @@ steps: commands: # - sed -i "s@https://.*"@https://iot.1000my.com"@" build/public/config.json - obsutil config -i=$obs_key -k=$obs_secret -e=obs.cn-east-2.myhuaweicloud.com - - obsutil mkdir obs://qianmu-iot/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}/ - - obsutil cp -r -f -flat build obs://qianmu-iot/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}/ + - obsutil mkdir obs://qianmu-iot/${DRONE_REPO_NAME}/ + - obsutil cp -r -f -flat build obs://qianmu-iot/${DRONE_REPO_NAME}/ when: branch: - master @@ -172,7 +172,7 @@ steps: from_secret: "obs_secret" cdn_url: https://qianmu-iot.1000my.com/ commands: - - export cdn_url=https://qianmu-iot.1000my.com/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}-${DRONE_BRANCH}/ + - export cdn_url=https://qianmu-iot.1000my.com/${DRONE_REPO_NAME}-${DRONE_BRANCH}/ - /cdn.bin when: branch: @@ -194,7 +194,7 @@ steps: from_secret: "obs_secret" cdn_url: https://qianmu-iot.1000my.com/ commands: - - export cdn_url=https://qianmu-iot.1000my.com/${DRONE_REPO_NAMESPACE}-${DRONE_REPO_NAME}/ + - export cdn_url=https://qianmu-iot.1000my.com/${DRONE_REPO_NAME}/ - /cdn.bin when: branch: