xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #7271 from taosdata/revert-7256-test/skipci_master 

Revert "[TD-5909]test skip ci [ci skip]"
This commit is contained in:
Hui Li 2021-08-10 10:16:59 +08:00 committed by GitHub
parent f08fe18aec cbd5f344cf
commit 153ce125ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.drone.yml
View File

@ -248,4 +248,5 @@ steps:
when: when:
branch: branch:
- develop - develop
- master - master

4
Jenkinsfile vendored
View File

@ -6,7 +6,7 @@ node {
} }
def skipstage=0 def skipstage=0
def skipbuild=0
def abortPreviousBuilds() { def abortPreviousBuilds() {
def currentJobName = env.JOB_NAME def currentJobName = env.JOB_NAME
def currentBuildNumber = env.BUILD_NUMBER.toInteger() def currentBuildNumber = env.BUILD_NUMBER.toInteger()
@ -146,7 +146,6 @@ pipeline {
script{ script{
env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD ${env.CHANGE_TARGET}|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true) env.skipstage=sh(script:"cd ${WORKSPACE}.tes && git --no-pager diff --name-only FETCH_HEAD ${env.CHANGE_TARGET}|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 0 ",returnStdout:true)
env.skipbuild=sh(script: "git log -1 --pretty=%B | fgrep -ie '[skip ci]' -e '[ci skip]'", returnStatus: true)
} }
println env.skipstage println env.skipstage
sh''' sh'''
@ -161,7 +160,6 @@ pipeline {
changeRequest() changeRequest()
expression { expression {
env.skipstage != 0 env.skipstage != 0
env.skipbuild ==1
} }
} }
parallel { parallel {