Skip to content

Commit

Permalink
Merge pull request #143 from raakella1/sisl_update
Browse files Browse the repository at this point in the history
include build missing unconditionally
  • Loading branch information
raakella1 authored Aug 30, 2023
2 parents e729ff8 + 8daccd4 commit 85b234f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions .jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,14 @@ pipeline {
steps {
script {
sh(script: "sed -Ei 's,version = .*\"([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+).*,version = \"\\1-${env.BUILD_NUMBER}\",' conanfile.py")
BUILD_MISSING = "--build missing"
LAST_COMMITS = sh(script: "git log -n 2 --pretty=short", returnStdout: true)
}
}
}
stage('Adjust for Stable') {
when {
branch "${STABLE_BRANCH}"
}
stage('Include build missing') {
steps {
script {
BUILD_MISSING = ""
BUILD_MISSING = "--build missing"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

class HomestoreConan(ConanFile):
name = "homestore"
version = "3.6.10"
version = "3.6.11"

homepage = "https://github.corp.ebay.com/SDS/homestore"
description = "HomeStore"
Expand Down

0 comments on commit 85b234f

Please sign in to comment.