From 4c39e38a5fb16b0c2296b7df1e5930d49e1dcf47 Mon Sep 17 00:00:00 2001 From: Viktor Gal Date: Mon, 24 Sep 2018 09:10:49 -0400 Subject: [PATCH] add initial azure pipelines definition --- .ci/archive-deploy.yml | 21 +++++++ .ci/ci.yml | 115 +++++++++++++++++++++++++++++++++++ .ci/docker-steps.yml | 110 +++++++++++++++++++++++++++++++++ .ci/download-extract.yml | 49 +++++++++++++++ .ci/macos-steps.yml | 47 ++++++++++++++ .ci/setup_clcache.cmd | 16 +++++ .ci/windows-steps.yml | 74 ++++++++++++++++++++++ .travis.yml | 79 ------------------------ CMakeLists.txt | 40 ++++++------ README.md | 3 +- appveyor.yml | 37 ----------- examples/meta/CMakeLists.txt | 2 +- tests/meta/CMakeLists.txt | 2 +- 13 files changed, 454 insertions(+), 141 deletions(-) create mode 100644 .ci/archive-deploy.yml create mode 100644 .ci/ci.yml create mode 100644 .ci/docker-steps.yml create mode 100644 .ci/download-extract.yml create mode 100644 .ci/macos-steps.yml create mode 100644 .ci/setup_clcache.cmd create mode 100644 .ci/windows-steps.yml delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.ci/archive-deploy.yml b/.ci/archive-deploy.yml new file mode 100644 index 00000000000..76e70d7eed2 --- /dev/null +++ b/.ci/archive-deploy.yml @@ -0,0 +1,21 @@ +parameters: + artifactName: '' + archive: '' + name: '' + dir: '' + +steps: +- task: ArchiveFiles@2 + displayName: ${{ format('Archive {0}', parameters.name) }} + inputs: + rootFolderOrFile: ${{ parameters.dir }} + includeRootFolder: false + archiveType: tar + archiveFile: ${{ parameters.archive }} + +- task: PublishBuildArtifacts@1 + displayName: ${{ format('Publish {0} archive', parameters.name) }} + inputs: + pathtoPublish: ${{ parameters.archive }} + artifactName: ${{ parameters.artifactName }} + publishLocation: 'Container' diff --git a/.ci/ci.yml b/.ci/ci.yml new file mode 100644 index 00000000000..e8f626de4ed --- /dev/null +++ b/.ci/ci.yml @@ -0,0 +1,115 @@ +jobs: +- job: libshogun + displayName: Linux libshogun CI Tests + + pool: + vmImage: ubuntu-16.04 + + strategy: + maxParallel: 2 + matrix: + clang: + CC: "clang" + CXX: "clang++" + cmakeOptions: '' + gcc: + CC: "gcc" + CXX: "g++" + cmakeOptions: '' + + variables: + testRunTitle: '$(build.sourceBranchName)-debian' + testRunPlatform: debian + imageName: 'shogun/shogun-dev' + targetPrefix: '$(build.binariesDirectory)/opt' + libshogunArtifactName: 'libshogun-$(CC)' + libshogunArchive: '$(Build.ArtifactStagingDirectory)/libshogun-$(Build.BuildId).tar' + ccacheDir: '$(build.binariesDirectory)/ccache' + ccacheArtifactName: 'ccache-$(CC)' + ccacheArchive: '$(Build.ArtifactStagingDirectory)/ccache-$(Build.BuildId).tar' + + steps: + - template: ./docker-steps.yml + +- job: swig + displayName: Linux SWIG Interface CI Tests + dependsOn: libshogun + + pool: + vmImage: ubuntu-16.04 + + strategy: + maxParallel: 7 + matrix: + python: + CC: "clang" + CXX: "clang++" + cmakeOptions: '$(commonSWIGCMakeFlags) -DINTERFACE_PYTHON=ON' + interfaceName: 'python' + java: + CC: "clang" + CXX: "clang++" + cmakeOptions: '$(commonSWIGCMakeFlags) -DINTERFACE_JAVA=ON' + interfaceName: 'java' + csharp: + CC: "clang" + CXX: "clang++" + cmakeOptions: '$(commonSWIGCMakeFlags) -DINTERFACE_CSHARP=ON' + interfaceName: 'csharp' + r: + CC: "clang" + CXX: "clang++" + cmakeOptions: '$(commonSWIGCMakeFlags) -DINTERFACE_R=ON' + interfaceName: 'r' + lua: + CC: "clang" + CXX: "clang++" + cmakeOptions: '$(commonSWIGCMakeFlags) -DINTERFACE_LUA=ON' + interfaceName: 'lua' + octave: + CC: "gcc" + CXX: "g++" + cmakeOptions: '$(commonSWIGCMakeFlags) -DINTERFACE_OCTAVE=ON' + interfaceName: 'octave' + ruby: + CC: "clang" + CXX: "clang++" + cmakeOptions: '$(commonSWIGCMakeFlags) -DINTERFACE_RUBY=ON' + interfaceName: 'ruby' + + variables: + testRunTitle: '$(build.sourceBranchName)-debian' + testRunPlatform: debian + imageName: 'shogun/shogun-dev' + targetPrefix: '$(build.binariesDirectory)/opt' + libshogunArtifactName: 'libshogun-$(CC)' + libshogunArchive: '$(Build.ArtifactStagingDirectory)/libshogun-$(Build.BuildId).tar' + commonSWIGCMakeFlags: '-DLIBSHOGUN=OFF -DDISABLE_UNIT_TESTS=ON -DDISABLE_META_CPP=ON' + ccacheDir: '$(build.binariesDirectory)/ccache' + ccacheArtifactName: 'ccache-$(interfaceName)' + ccacheArchive: '$(Build.ArtifactStagingDirectory)/ccache-$(Build.BuildId).tar' + + steps: + - template: ./docker-steps.yml + parameters: + swig: true + +- job: macOS + displayName: macOS CI Tests + + variables: + testRunTitle: '$(build.sourceBranchName)-macos' + testRunPlatform: macos + ccacheDir: '$(build.binariesDirectory)/ccache' + ccacheArtifactName: 'ccache-macos' + ccacheArchive: '$(Build.ArtifactStagingDirectory)/ccache-$(Build.BuildId).tar' + + pool: + vmImage: xcode9-macos10.13 + + steps: + - template: ./macos-steps.yml + +#- template: ./windows-steps.yml +# parameters: +# buildConfiguration: Release diff --git a/.ci/docker-steps.yml b/.ci/docker-steps.yml new file mode 100644 index 00000000000..e6503b3bbc4 --- /dev/null +++ b/.ci/docker-steps.yml @@ -0,0 +1,110 @@ +steps: +- checkout: self + clean: true + fetchDepth: 5 + submodules: true + +- script: mkdir $(ccacheDir) $(targetPrefix) + condition: + displayName: Create artifact directories + +- template: ./download-extract.yml + parameters: + name: 'CCache' + artifactName: $(ccacheArtifactName) + destinationFolder: $(ccacheDir) + downloadPath: $(build.binariesDirectory) + +- ${{ if eq(parameters.swig, 'true') }}: + - template: ./download-extract.yml + parameters: + name: 'LibShogun' + artifactName: $(libshogunArtifactName) + downloadPath: $(build.binariesDirectory) + destinationFolder: $(targetPrefix) + specificBuildWithTriggering: true + +- task: docker@0 + displayName: Setup + inputs: + action: 'Run an image' + imageName: $(imageName) + volumes: | + $(build.sourcesDirectory):/src + $(build.binariesDirectory):/build + envVars: | + CCACHE_DIR=/build/ccache + CC=$(CC) + CXX=$(CXX) + workDir: '/build' + containerCommand: 'cmake -DENABLE_TESTING=ON -DCMAKE_INSTALL_PREFIX=/build/opt $(cmakeOptions) /src' + detached: false + +- ${{ if ne(parameters.swig, 'true') }}: + # some of the cpps are just requiring way too much memory + - task: docker@0 + displayName: Build + inputs: + action: 'Run an image' + imageName: $(imageName) + volumes: | + $(build.sourcesDirectory):/src + $(build.binariesDirectory):/build + envVars: | + CCACHE_DIR=/build/ccache + workDir: '/build' + containerCommand: 'make -s shogun' + detached: false + +- task: docker@0 + displayName: Build + inputs: + action: 'Run an image' + imageName: $(imageName) + volumes: | + $(build.sourcesDirectory):/src + $(build.binariesDirectory):/build + envVars: | + CCACHE_DIR=/build/ccache + workDir: '/build' + containerCommand: 'make -j3 -s all' + detached: false + +- task: docker@0 + displayName: Install + inputs: + action: 'Run an image' + imageName: $(imageName) + volumes: | + $(build.sourcesDirectory):/src + $(build.binariesDirectory):/build + workDir: '/build' + containerCommand: 'make install' + detached: false + +- task: docker@0 + displayName: Test + inputs: + action: 'Run an image' + imageName: $(imageName) + volumes: | + $(build.sourcesDirectory):/src + $(build.binariesDirectory):/build + workDir: '/build' + containerCommand: 'ctest --output-on-failure -j 2' + detached: false + +- ${{ if ne(parameters.swig, 'true') }}: + - template: ./archive-deploy.yml + parameters: + name: 'LibShogun' + dir: $(targetPrefix) + archive: $(libshogunArchive) + artifactName: $(libshogunArtifactName) + +- template: ./archive-deploy.yml + parameters: + name: 'CCache' + dir: $(ccacheDir) + archive: $(ccacheArchive) + artifactName: $(ccacheArtifactName) diff --git a/.ci/download-extract.yml b/.ci/download-extract.yml new file mode 100644 index 00000000000..5ada84913e3 --- /dev/null +++ b/.ci/download-extract.yml @@ -0,0 +1,49 @@ +# NOTE: downloadPath and destinationFolder should not be the same! +# as ExtractFiles will create destinationFolder that will result +# in deleting anything in it, including the archive if downloadPath +# is the same as destinationFolder +parameters: + artifactName: '' + downloadPath: '' + name: '' + archiveFilePatterns: '' + destinationFolder: '' + specificBuildWithTriggering: false + +steps: +- ${{ if eq(parameters.specificBuildWithTriggering, 'true') }}: + - task: DownloadBuildArtifacts@0 + displayName: ${{ format('Download {0} archive', parameters.name) }} + continueOnError: true + inputs: + specificBuildWithTriggering: true + artifactName: ${{ parameters.artifactName }} + downloadPath: ${{ parameters.downloadPath }} + + +- ${{ if ne(parameters.specificBuildWithTriggering, 'true') }}: + - task: DownloadBuildArtifacts@0 + displayName: ${{ format('Download {0} archive', parameters.name) }} + continueOnError: true + inputs: + buildType: 'specific' + project: $(System.TeamProjectId) + pipeline: $(System.DefinitionId) + buildVersionToDownload: "latest" + artifactName: ${{ parameters.artifactName }} + downloadPath: ${{ parameters.downloadPath }} + +- task: ExtractFiles@1 + displayName: ${{ format('Extract {0} archive', parameters.name) }} + condition: eq(variables['Agent.JobStatus'], 'Succeeded') + inputs: + archiveFilePatterns: ${{ format('{0}/{1}/*.tar', parameters.downloadPath, parameters.artifactName) }} + destinationFolder: ${{ parameters.destinationFolder }} + cleanDestinationFolder: True + +# FIXME: remove this hack, as it's only needed because DownloadBuildArtifacts +# will not download artifact from jobs with SucceededWithIssues +- script: | + echo '##vso[task.setvariable variable=agent.jobstatus]Succeeded' + condition: eq(variables['Agent.JobStatus'], 'SucceededWithIssues') + displayName: Set JobStatus to Succeeded diff --git a/.ci/macos-steps.yml b/.ci/macos-steps.yml new file mode 100644 index 00000000000..8041766a640 --- /dev/null +++ b/.ci/macos-steps.yml @@ -0,0 +1,47 @@ +steps: +- checkout: self + clean: true + fetchDepth: 5 + submodules: true + +- script: mkdir $(ccacheDir) + condition: + displayName: Create CCache directory + +- template: ./download-extract.yml + parameters: + name: 'CCache' + artifactName: $(ccacheArtifactName) + destinationFolder: $(ccacheDir) + downloadPath: $(build.binariesDirectory) + +- script: | + ls -la $(ccacheDir) + displayName: Debug + +- bash: | + brew update + brew install cmake ccache pkg-config arpack eigen glpk hdf5 json-c lapack lzo nlopt snappy xz + displayName: Install dependencies + +- task: CMake@1 + displayName: Setup + inputs: + cmakeArgs: -DBUILD_EXAMPLES=OFF -DBUNDLE_JSON=OFF -DBUNDLE_NLOPT=OFF -DENABLE_TESTING=ON -DENABLE_COVERAGE=OFF -DBUILD_META_EXAMPLES=OFF .. + +- script: make -j4 + displayName: Build + workingDirectory: build + env: + CCACHE_DIR: $(ccacheDir) + +- script: ctest --output-on-failure -j 2 + displayName: Test + workingDirectory: build + +- template: ./archive-deploy.yml + parameters: + name: 'CCache' + dir: $(ccacheDir) + archive: $(ccacheArchive) + artifactName: $(ccacheArtifactName) diff --git a/.ci/setup_clcache.cmd b/.ci/setup_clcache.cmd new file mode 100644 index 00000000000..c8ffedc39c8 --- /dev/null +++ b/.ci/setup_clcache.cmd @@ -0,0 +1,16 @@ +@rem https://github.com/numba/numba/blob/master/buildscripts/incremental/setup_conda_environment.cmd +@rem The cmd /C hack circumvents a regression where conda installs a conda.bat +@rem script in non-root environments. +set CONDA_INSTALL=cmd /C conda install -q -y +set PIP_INSTALL=pip install -q + +@echo on + +@rem Use clcache for faster builds +pip install -q git+https://github.com/frerich/clcache.git +clcache -s +set CLCACHE_SERVER=1 +set CLCACHE_HARDLINK=1 +powershell.exe -Command "Start-Process clcache-server" + +if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/.ci/windows-steps.yml b/.ci/windows-steps.yml new file mode 100644 index 00000000000..2346fd584eb --- /dev/null +++ b/.ci/windows-steps.yml @@ -0,0 +1,74 @@ +parameters: + buildConfiguration: Release + +jobs: +- job: Windows + displayName: Windows CI Tests + pool: + vmImage: 'vs2017-win2016' + + strategy: + matrix: + py36: + CONDA_PY: "36" + CONDA_ENV: shogun + + variables: + clcacheDir: 'C:\\Users\\VssAdministrator\\clcache' + clcacheArtifactName: 'ccache-vs14' + clcacheArchive: '$(Build.ArtifactStagingDirectory)/clache-$(Build.BuildId).tar.xz' + + steps: + - checkout: self + clean: true + fetchDepth: 5 + submodules: true + + - template: ./download-extract.yml + parameters: + name: 'CLcache' + artifactName: $(clcacheArtifactName) + destinationFolder: $(clcacheDir) + downloadPath: $(build.binariesDirectory) + + - task: CondaEnvironment@1 + displayName: Install dependencies + inputs: + createCustomEnvironment: True + environmentName: shogun + packageSpecs: 'python=3.6.* setuptools numpy scipy eigen rxcpp snappy zlib ctags ply mkl-devel jinja2' + createOptions: '-c conda-forge' + updateConda: false + + - script: | + .ci\\setup_clcache.cmd + displayName: Setup CLCache + + - task: CMake@1 + displayName: Setup + inputs: + cmakeArgs: ${{ format('-G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE={0} -DCMAKE_INSTALL_PREFIX=$(CONDA_PREFIX)\Library -DBUILD_META_EXAMPLES=OFF -DENABLE_TESTING=ON ..', parameters.buildConfiguration) }} + + - task: VSBuild@1 + displayName: Build + inputs: + solution: 'build/shogun.sln' + vsVersion: '14.0' + platform: x64 + msbuildArgs: '/p:TrackFileAccess=false /p:CLToolExe=clcache.exe' + configuration: ${{ parameters.buildConfiguration }} + + - script: ctest -j%NUMBER_OF_PROCESSORS% -C ${{ parameters.buildConfiguration }} + displayName: Test + workingDirectory: build + + - script: clcache -s + displayName: CLCache statistics + + - template: ./archive-deploy.yml + parameters: + name: 'CLcache' + dir: $(clcacheDir) + archive: $(clcacheArchive) + artifactName: $(clcacheArtifactName) + diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ac344ad548c..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,79 +0,0 @@ -sudo: required -language: cpp -cache: ccache -notifications: - email: false - irc: - channels: - - "irc.freenode.org#shogun" - on_success: change - on_failure: always - template: - - "it's %{author}'s turn to pay the next round of drinks for the massacre he caused in %{repository}: %{build_url}" -env: - global: - - INTERFACE_TEST_OPTIONS="-DTRAVIS_DISABLE_UNIT_TESTS=ON -DTRAVIS_DISABLE_META_CPP=ON" -matrix: - fast_finish: true - include: - - compiler: gcc - services: docker - - compiler: clang - services: docker - - compiler: gcc - services: docker - env: - - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON -DENABLE_CCACHE=OFF" - - CODE_COVERAGE=1 - - compiler: clang - services: docker - env: - - CMAKE_OPTIONS="-DINTERFACE_PYTHON=ON ${INTERFACE_TEST_OPTIONS}" - - CC=clang - - CXX=clang++ - - compiler: clang - services: docker - env: - - CMAKE_OPTIONS="-DINTERFACE_RUBY=ON ${INTERFACE_TEST_OPTIONS}" - - CC=clang - - CXX=clang++ - - compiler: clang - services: docker - env: - - CMAKE_OPTIONS="-DINTERFACE_JAVA=ON ${INTERFACE_TEST_OPTIONS}" - - CC=clang - - CXX=clang++ - - compiler: clang - services: docker - env: - - CMAKE_OPTIONS="-DINTERFACE_CSHARP=ON ${INTERFACE_TEST_OPTIONS}" - - CC=clang - - CXX=clang++ - - compiler: gcc - services: docker - env: - - CMAKE_OPTIONS="-DINTERFACE_OCTAVE=ON ${INTERFACE_TEST_OPTIONS}" - - INTERFACE_OCTAVE=true - - compiler: clang - services: docker - env: - - CMAKE_OPTIONS="-DINTERFACE_R=ON ${INTERFACE_TEST_OPTIONS}" - - CC=clang - - CXX=clang++ - allow_failures: - - compiler: gcc - services: docker - env: - - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=ON -DENABLE_CCACHE=OFF" - - CODE_COVERAGE=1 -before_install: - - $TRAVIS_BUILD_DIR/scripts/travis_before_install.sh -before_script: - - $TRAVIS_BUILD_DIR/scripts/travis_before_script.sh -script: - - $TRAVIS_BUILD_DIR/scripts/travis_script.sh -after_success: - - | - if [ $CODE_COVERAGE ] ; then - docker exec -t devenv /bin/sh -c "cd /opt/shogun/build; lcov --directory src/shogun/ --capture --output-file all_coverage.info; lcov --remove all_coverage.info '/usr/*' > coverage.info; rm all_coverage.info; codecov -X gcov" - fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 197ee5efbb5..b7407eb825c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -480,29 +480,12 @@ IF(BUILD_DASHBOARD_REPORTS) ENDIF() OPTION(ENABLE_TESTING "Enable testing" OFF) -OPTION(TRAVIS_DISABLE_UNIT_TESTS "Disable unit testing to speed up jobs on travis-ci" OFF) -OPTION(TRAVIS_DISABLE_META_CPP "Disable cpp meta examples and integration testing to speed up jobs on travis-ci" OFF) +OPTION(DISABLE_UNIT_TESTS "Disable unit testing" OFF) +OPTION(DISABLE_META_CPP "Disable cpp meta examples and integration testing" OFF) OPTION(DISABLE_META_INTEGRATION_TESTS "Disable meta integration testing to speed up build" OFF) - -IF(ENABLE_TESTING) - IF (NOT LIBSHOGUN) - MESSAGE(FATAL_ERROR "Cannot compile tests without libshogun!") - ENDIF() - - IF(EXISTS ${CMAKE_SOURCE_DIR}/tests) - IF(NOT BUILD_DASHBOARD_REPORTS) - enable_testing() - ENDIF() - - IF (NOT TRAVIS_DISABLE_UNIT_TESTS AND EXISTS ${CMAKE_SOURCE_DIR}/tests/unit) - add_subdirectory(${CMAKE_SOURCE_DIR}/tests/unit) - ENDIF() - - IF(BUILD_META_EXAMPLES AND NOT DISABLE_META_INTEGRATION_TESTS AND EXISTS ${CMAKE_SOURCE_DIR}/tests/meta) - add_subdirectory(${CMAKE_SOURCE_DIR}/tests/meta) - ENDIF() - ENDIF() +IF(ENABLE_TESTING AND NOT BUILD_DASHBOARD_REPORTS) + enable_testing() ENDIF() IF(EXISTS ${CMAKE_SOURCE_DIR}/examples) @@ -519,6 +502,21 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/examples) ENDIF() ENDIF() +IF(ENABLE_TESTING) + IF(EXISTS ${CMAKE_SOURCE_DIR}/tests) + IF (NOT DISABLE_UNIT_TESTS AND EXISTS ${CMAKE_SOURCE_DIR}/tests/unit) + if (NOT LIBSHOGUN) + MESSAGE(FATAL_ERROR "Cannot compile tests without libshogun!") + ENDIF() + add_subdirectory(${CMAKE_SOURCE_DIR}/tests/unit) + ENDIF() + + IF(BUILD_META_EXAMPLES AND NOT DISABLE_META_INTEGRATION_TESTS AND EXISTS ${CMAKE_SOURCE_DIR}/tests/meta) + add_subdirectory(${CMAKE_SOURCE_DIR}/tests/meta) + ENDIF() + ENDIF() +ENDIF() + IF(EXISTS ${CMAKE_SOURCE_DIR}/doc) add_subdirectory(${CMAKE_SOURCE_DIR}/doc) ENDIF() diff --git a/README.md b/README.md index 12400432d3f..2d9d7f7bbf8 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,7 @@ Cite Shogun: Develop branch build status: -[![Build Status](https://travis-ci.org/shogun-toolbox/shogun.svg?branch=develop)](https://travis-ci.org/shogun-toolbox/shogun) -[![Build status](https://ci.appveyor.com/api/projects/status/jx095rnr9qhg8dcv/branch/develop?svg=true)](https://ci.appveyor.com/project/vigsterkr/shogun/branch/develop) +[![Build status](https://dev.azure.com/shogunml/shogun/_apis/build/status/shogun-CI)](https://dev.azure.com/shogunml/shogun/_build/latest?definitionId=-1) [![codecov](https://codecov.io/gh/shogun-toolbox/shogun/branch/develop/graph/badge.svg)](https://codecov.io/gh/shogun-toolbox/shogun) Donate to Shogun via NumFocus: diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index e04d6604dc5..00000000000 --- a/appveyor.yml +++ /dev/null @@ -1,37 +0,0 @@ -version: "{build}" - -cache: - - C:\Users\appveyor\clcache - - third_party/GoogleMock -> cmake/external/GoogleTestNMock.cmake - -environment: - matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - GENERATOR: Visual Studio 15 2017 Win64 - PYTHON: "3.6" - APPVEYOR_SAVE_CACHE_ON_ERROR: true - -platform: - - x64 - -configuration: - - Release - -install: - - set MINICONDA=C:\Miniconda36-x64 - - set PATH=%MINICONDA%;%MINICONDA%/Scripts;%MINICONDA%/Library/bin;%PATH% - - call scripts\appveyor-setup.bat - - git submodule -q update --init - -build: - verbosity: minimal - -build_script: - - call scripts\msvc-build.bat - -test_script: - - cd %APPVEYOR_BUILD_FOLDER%\build - - ctest --output-on-failure -C %CONFIGURATION% - -after_build: - - clcache -s diff --git a/examples/meta/CMakeLists.txt b/examples/meta/CMakeLists.txt index 8f1df0256f2..121408cb6bb 100644 --- a/examples/meta/CMakeLists.txt +++ b/examples/meta/CMakeLists.txt @@ -123,7 +123,7 @@ IF (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/data) ENDIF() # c++ -IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cpp AND NOT ${TRAVIS_DISABLE_META_CPP}) +IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cpp AND NOT ${DISABLE_META_CPP}) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cpp) ENDIF() diff --git a/tests/meta/CMakeLists.txt b/tests/meta/CMakeLists.txt index 964e42707ae..29b5e22b8a4 100644 --- a/tests/meta/CMakeLists.txt +++ b/tests/meta/CMakeLists.txt @@ -53,7 +53,7 @@ FOREACH(REFERENCE_FILE ${META_INTEGRATION_REFERENCES}) IF(${LISTING_INDEX} EQUAL -1) MESSAGE(WARNING "Skipping integration test for meta example ${REL_DIR}/${NAME}.sg") ELSE() - IF (NOT ${TRAVIS_DISABLE_META_CPP} AND NOT ${DISABLE_META_INTEGRATION_TESTS}) + IF (NOT ${DISABLE_META_CPP} AND NOT ${DISABLE_META_INTEGRATION_TESTS}) AddMetaIntegrationTest(cpp 1) ENDIF() IF (NOT ${DISABLE_META_INTEGRATION_TESTS})