Merge branch 'stable/v8.x'

eBay · Aug 30, 2023 · 09a047a · 09a047a
2 parents 9d73227 + b43ed01
commit 09a047a
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
@@ -21,18 +21,14 @@ pipeline {
             } }
             steps {
                 script {
-                    sh(script: "sed -Ei 's, version = .*\"([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+).*, version = \"\\1-${env.BUILD_NUMBER}\",' conanfile.py")
-                    BUILD_MISSING = "--build missing"
+                    sh(script: "sed -Ei 's,version = .*\"([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+).*,version = \"\\1-${env.BUILD_NUMBER}\",' conanfile.py")
                 }
             }
         }
-        stage('Adjust for Testing/Stable') {
-            when {
-                branch "${STABLE_BRANCH}"
-            }
+        stage('Include build missing') {
             steps {
                 script {
-                    BUILD_MISSING = ""
+                    BUILD_MISSING = "--build missing"
                 }
             }
         }