~chengyuhong/git_study.git

parent: b87f2047 | patch | commit | show whitespace

zhanglei

2021-11-18 4fd958a94fdc366ba0414c0615dc638622d770dd

Merge branch 'hotfix/1.0.1'

1 files modified

1 files added

	Jenkinsfile	7 ●●●●● patch \| view \| raw \| blame \| history
	test.js	1 ●●●●● patch \| view \| raw \| blame \| history

 Jenkinsfile

@@ -34,6 +34,9 @@
        stage('version add') {
            when {
                allOf {
                    not {
                        branch 'master'
                    }
                    anyOf {
                        changeset "**/*.js"
                        changeset "**/*.css"
@@ -48,10 +51,12 @@
                }
            }
            steps {
                versionAdd("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
                echo "todo add version"
            }

        }
        stage('deploy') {
            when { branch 'master' }
            steps {
                sh 'echo test'
            }

 test.js

New file
@@ -0,0 +1 @@
test.fsdf

			@@ -34,6 +34,9 @@
			stage('version add') {
			when {
			allOf {
			not {
			branch 'master'
			}
			anyOf {
			changeset "*/.js"
			changeset "*/.css"
			@@ -48,10 +51,12 @@
			}
			}
			steps {
			versionAdd("${project_name}","${GIT_CREDENTIALS_ID}","${url}","${GIT_BRANCH}")
			echo "todo add version"
			}

			}
			stage('deploy') {
			when { branch 'master' }
			steps {
			sh 'echo test'
			}