Changeset dc8b9c30 in OpenModelica


Ignore:
Timestamp:
2019-10-28T14:15:09+01:00 (4 years ago)
Author:
Adrian Pop <adrian.pop@…>
Branches:
maintenance/v1.13
Parents:
cd9628b7
Message:

fix maintenace/v1.13 builds

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    rc6488e52 rdc8b9c30  
    493493void patchConfigStatus() {
    494494  // Running on nodes with different paths for the workspace
    495   sh 'sed -i "s,--with-ombuilddir=[A-Za-z0-9/_-]*,--with-ombuilddir=`pwd`/build," config.status'
     495  sh 'sed -i "s,--with-ombuilddir=[A-Za-z0-9./_-]*,--with-ombuilddir=`pwd`/build," config.status'
    496496}
    497497
     
    547547  sh "test -f ${env.COMPLIANCEPREFIX}.xml"
    548548  // Only publish openmodelica-current.html if we are running master
    549   sh "cp -p ${env.COMPLIANCEPREFIX}-current.html ${env.COMPLIANCEPREFIX}${cacheBranch()=='master' ? '' : ('-' + cacheBranch()).replace('/','-')}-${getVersion()}.html"
     549  sh "cp -p ${env.COMPLIANCEPREFIX}-current.html ${env.COMPLIANCEPREFIX}${cacheBranch()=='master' ? '' : ('-' + cacheBranchEscape())}-${getVersion()}.html"
    550550  sh "test ! '${cacheBranch()}' = 'master' || rm -f ${env.COMPLIANCEPREFIX}-current.html"
    551551  stash name: "${env.COMPLIANCEPREFIX}", includes: "${env.COMPLIANCEPREFIX}-*.html"
     
    560560}
    561561
     562def cacheBranchEscape() {
     563  def name = (cacheBranch()).replace('maintenance/v','')
     564  name = name.replace('/','-')
     565  return name
     566}
     567
    562568def tagName() {
    563   def name = env.TAG_NAME ?: cacheBranch()
     569  def name = env.TAG_NAME ?: cacheBranchEscape()
    564570  return name == "master" ? "latest" : name
    565571}
Note: See TracChangeset for help on using the changeset viewer.