diff --git a/.drone.yml b/.drone.yml index dbcc3b0..0f73f43 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,7 +25,7 @@ steps: branch: # - develop # - master - - release/S3 + - release/s4 event: - push ### 应用版本控制:检查版本文件,若不存在则自动创建,并自动递增版本号 @@ -38,14 +38,14 @@ steps: - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories - apk add tree --no-cache - tree ./$backendName - - make branch=release/S3 vc + - make branch=release/s4 vc # - make branch=master vc when: status: [ success ] branch: # - develop # - master - - release/S3 + - release/s4 event: - push ### 打包镜像并推送到镜像仓库 @@ -76,27 +76,27 @@ steps: branch: # - develop # - master - - release/S3 + - release/s4 ### 应用版本控制:提交版本文件的修改记录,并为代码分支创建版本号标签 - name: Upload Version image: registry.digiwincloud.com.cn/base/base_vc commands: # - make branch=develop to_git # - make branch=master to_git - - make branch=release/S3 to_git + - make branch=release/s4 to_git when: status: [ success ] branch: # - develop # - master - - release/S3 + - release/s4 event: - push trigger: branch: # - develop # - master - - release/S3 + - release/s4 event: - push volumes: diff --git a/VERSION b/VERSION index e6d5cb8..a6a3a43 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.2 \ No newline at end of file +1.0.4 \ No newline at end of file diff --git a/version_control/APP_VERSION b/version_control/APP_VERSION index 6d7de6e..ee90284 100644 --- a/version_control/APP_VERSION +++ b/version_control/APP_VERSION @@ -1 +1 @@ -1.0.2 +1.0.4 diff --git a/version_control/BUILD b/version_control/BUILD index d0378c4..a6905f8 100644 --- a/version_control/BUILD +++ b/version_control/BUILD @@ -1 +1 @@ -1049 +999