Browse Source

Merge branch 'develop' into sprint/S2

master
董书康 1 year ago
parent
commit
b3146de76d
3 changed files with 4 additions and 3 deletions
  1. +2
    -2
      .drone.yml
  2. +1
    -0
      README.md
  3. +1
    -1
      version_control/BUILD

+ 2
- 2
.drone.yml View File

@ -38,7 +38,7 @@ steps:
- sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories - sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
- apk add tree --no-cache - apk add tree --no-cache
- tree ./$backendName - tree ./$backendName
- make branch=develop vc
- make branch=release/S2 vc
# - make branch=master vc # - make branch=master vc
when: when:
status: [ success ] status: [ success ]
@ -83,7 +83,7 @@ steps:
commands: commands:
# - make branch=develop to_git # - make branch=develop to_git
# - make branch=master to_git # - make branch=master to_git
- make branch=develop to_git
- make branch=release/S2 to_git
when: when:
status: [ success ] status: [ success ]
branch: branch:


+ 1
- 0
README.md View File

@ -1,2 +1,3 @@
# demo-athenaopt # demo-athenaopt
测试 release/S2 打包

+ 1
- 1
version_control/BUILD View File

@ -1 +1 @@
999
1000

Loading…
Cancel
Save