From c6a6933629dc12a546d488addf3eb59839d5dde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=83=E7=9B=AE=E7=AE=A1=E7=90=86=E5=91=98?= Date: Wed, 5 Jul 2023 10:40:04 +0800 Subject: [PATCH] fix: ci --- .drone.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5a9bbc3..3ac733b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,20 +43,20 @@ steps: 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: 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: -- 2.30.2