Changeset 14080


Ignore:
Timestamp:
Nov 15, 2019 1:33:17 PM (4 weeks ago)
Author:
randersson
Message:

#5819 [ci skip] Fixed issue with failing builds for wheels building externals

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/ThirdParty/build_thirdparties/Jenkins/ci/vars/buildThirdPartyFromMake.groovy

    r14056 r14080  
    1 def call(JM_CHECKOUT_PATH, JM_BRANCH, INSTALL_PATH, module,bitness=["32", "64"], stash=false, archive=true, target_suffix="") {
     1def call(JM_CHECKOUT_PATH, JM_BRANCH, INSTALL_PATH, module,bitness=["32", "64"], stash=false, archive=false, target_suffix="") {
    22    if (JM_CHECKOUT_PATH != null) {
    33        checkoutJM(${JM_BRANCH})
  • trunk/external/build_externals/Jenkins/ci/vars/buildAssimulo.groovy

    r14056 r14080  
    3131            cd \${JM_HOME}/external/build_externals/build/assimulo
    3232           
    33             make clean USER_CONFIG=${USER_CONFIG} BUILD_DIR=\${JENKINS_BUILD_DIR}
    34             make ${TARGET} USER_CONFIG=${USER_CONFIG} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} WORKSPACE=\${JM_HOME}/.. INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${msvs_suffix}
     33            make clean USER_CONFIG=${USER_CONFIG} BUILD_DIR=\${JENKINS_BUILD_DIR} INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
     34            make ${TARGET} USER_CONFIG=${USER_CONFIG}${bit} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} WORKSPACE=\${JM_HOME}/.. INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
    3535            """, extra_bat);
    3636            if ("${TARGET}" == "folder") {
     
    4545                        stash includes: "Python_${bit}/**", name: "Python_${bit}_assimulo_${TARGET}"
    4646                    }
    47                     if (msvs_suffix == "msvs") {
    48                         archiveArtifacts artifacts: "${msvs_suffix}/assimulo/**", fingerprint: false
     47                    if (TARGET == "wheel") {
     48                        archiveArtifacts artifacts: "${bit}/${TARGET}/**", fingerprint: false
    4949                    } else {
    50                         archiveArtifacts artifacts: "assimulo/**", fingerprint: false
     50                        // archiving the entire directory
     51                        if (msvs_suffix == "msvs") {
     52                            archiveArtifacts artifacts: "${bit}${msvs_suffix}/assimulo/**", fingerprint: false
     53                        } else {
     54                            archiveArtifacts artifacts: "${bit}/assimulo/**", fingerprint: false
     55                        }
    5156                    }
    5257                }
  • trunk/external/build_externals/build/pyfmi/makefile

    r12145 r14080  
    99
    1010test_wheel: $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)
    11     @pip install $(INSTALL_DIR_FOLDER)/$(subst test_,,$@)/*.whl
     11    @cd $(INSTALL_DIR_FOLDER)/$(subst test_,,$@) && pwd && ls -la && pip install *.whl
    1212    nosetests $(WHEEL_INSTALL_DIR)/tests/*.py
    1313
  • trunk/external/build_externals/configurations/Assimulo/windows/win64

    r14056 r14080  
    2626EXTRA_SETUP_ARGS=--no-msvcr=true --with_openmp=True
    2727
    28 INSTALL_DIR_FOLDER=${SDK_HOME}/install/Python_64
    2928SUPERLU_HOME=$(BUILD_DIR)/superlu_install64
    3029SUNDIALS_HOME=$(BUILD_DIR)/sundials_install64
  • trunk/external/build_externals/docker/src/components/PyFMI/jenkins_centos_config

    r12084 r14080  
    2929PYFMI_FOLDER_INSTALL_DIR=${JM_HOME}/${DISTRO}/pyfmi${BITNESS}/folder/pyfmi
    3030FMIL_INSTALL=${JM_HOME}/${DISTRO}/${TARGET}${BITNESS}/fmil_install
     31INSTALL_DIR_FOLDER=${JM_HOME}/${DISTRO}/${TARGET}${BITNESS}
  • trunk/external/build_externals/docker/src/components/PyFMI/jenkins_ubuntu_config

    r12084 r14080  
    2929PYFMI_FOLDER_INSTALL_DIR=${JM_HOME}/${DISTRO}/pyfmi${BITNESS}/folder/pyfmi
    3030FMIL_INSTALL=${JM_HOME}/${DISTRO}/${TARGET}${BITNESS}/fmil_install
     31INSTALL_DIR_FOLDER=${JM_HOME}/${DISTRO}/${TARGET}${BITNESS}
Note: See TracChangeset for help on using the changeset viewer.