From b1b7db9796995304379ce69c8fd1f5c341817a75 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Mon, 9 Aug 2021 16:50:18 +0800 Subject: [PATCH] test[ci skip] --- .drone.yml | 3 ++- Jenkinsfile | 8 +------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 53b4ef738a..318761361e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -248,4 +248,5 @@ steps: when: branch: - develop - - master \ No newline at end of file + - master + \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 713c9f644e..8102c0e7ba 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -142,9 +142,6 @@ pipeline { sh''' git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD - cd ${WORKSPACE}.tes - git --no-pager diff --name-only FETCH_HEAD ${env.CHANGE_TARGET}|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' - git log -1 --pretty=%B | grep -ie \'\\[skip ci\\]\' -e \'\\[ci skip\\]\' ''' script{ @@ -155,11 +152,8 @@ pipeline { currentBuild.result = 'SUCCESS' currentBuild.getRawBuild().getExecutor().interrupt(Result.SUCCESS) } - if (sh(script: "git log -1 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]'", returnStatus: true) == 0) { + if (sh(script: "git log -1 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]'", returnStatus: true) == 1) { currentBuild.result = 'SUCCESS' - sh''' - git log -1 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip] - ''' currentBuild.getRawBuild().getExecutor().interrupt(Result.SUCCESS) } } -- GitLab