From 0716b52ff73b75463e27e399983e51f47b10846e Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Mon, 1 Jul 2019 13:51:05 +0200 Subject: [PATCH 1/2] PERF: Remove Ubuntu1404 from CI Remove Ubuntu1404 from Azure CI to speedup the CI build, as we discussed at our SuperElastix sprint. --- Testing/CI/Azure/ci.yml | 62 ----------------------------------------- 1 file changed, 62 deletions(-) diff --git a/Testing/CI/Azure/ci.yml b/Testing/CI/Azure/ci.yml index 75cf1cb63..fed5ee1a6 100644 --- a/Testing/CI/Azure/ci.yml +++ b/Testing/CI/Azure/ci.yml @@ -97,68 +97,6 @@ jobs: - bash: ctest --config Release -VV -j 2 displayName: 'CTest Elastix' workingDirectory: $(ELASTIX_BINARY_DIR) -- job: Ubuntu1404 - timeoutInMinutes: 0 - pool: - vmImage: 'ubuntu-16.04' - container: ubuntu:14.04 - strategy: - matrix: - ITKv4: - itk.version: $(ITKv4_VERSION) - ITKv5: - itk.version: $(ITKv5_VERSION) - steps: - - script: | - sudo apt-get update && \ - sudo apt-get -y upgrade && \ - sudo apt-get install -y build-essential && \ - sudo apt-get install -y software-properties-common && \ - sudo apt-get install -y git wget - displayName: Install dependencies - - script: | - wget https://github.com/Kitware/CMake/releases/download/v3.13.3/cmake-3.13.3.tar.gz - tar -xvzf cmake-3.13.3.tar.gz - pushd cmake-3.13.3/ - ./configure - make -j2 - sudo make install - popd - sudo update-alternatives --install /usr/bin/cmake cmake /usr/local/bin/cmake 1 --force - displayName: Build CMake - - script: | - git clone https://github.com/InsightSoftwareConsortium/ITK $(ITK_SOURCE_DIR) - pushd $(ITK_SOURCE_DIR) - git checkout $(itk.version) - popd - displayName: Clone ITK - - script: | - mkdir $(ITK_BINARY_DIR) - mkdir $(ELASTIX_BINARY_DIR) - displayName: Make build directories - - task: CMake@1 - displayName: 'CMake Generate ITK' - inputs: - cmakeArgs: -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF $(ITK_SOURCE_DIR) - workingDirectory: $(ITK_BINARY_DIR) - - task: CMake@1 - displayName: 'CMake Build ITK' - inputs: - cmakeArgs: --build . --config Release -j 2 - workingDirectory: $(ITK_BINARY_DIR) - - task: CMake@1 - displayName: 'CMake Generate Elastix' - inputs: - cmakeArgs: -DITK_DIR=$(ITK_BINARY_DIR) -DBUILD_TESTING=ON -DUSE_ALL_COMPONENTS=ON $(ELASTIX_SOURCE_DIR) - workingDirectory: $(ELASTIX_BINARY_DIR) - - task: CMake@1 - displayName: 'CMake Build Elastix' - inputs: - cmakeArgs: --build . --config Release -j 2 - workingDirectory: $(ELASTIX_BINARY_DIR) - - bash: ctest --config Release -VV -j 2 - displayName: 'CTest Elastix' - workingDirectory: $(ELASTIX_BINARY_DIR) - job: macOS timeoutInMinutes: 0 pool: From 52b9ad9991eaa163b269f1c15edb2acaffae58ce Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Mon, 1 Jul 2019 13:54:59 +0200 Subject: [PATCH 2/2] COMP: Build elastix at azure CI with the tagged ITK 4.13.2 Now using the last tagged version of ITK 4.13, for continuous integration. Note that support for ITK4 will soon be dropped. --- Testing/CI/Azure/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Testing/CI/Azure/ci.yml b/Testing/CI/Azure/ci.yml index fed5ee1a6..bb093abdf 100644 --- a/Testing/CI/Azure/ci.yml +++ b/Testing/CI/Azure/ci.yml @@ -1,5 +1,5 @@ variables: - ITKv4_VERSION: release-4.13 + ITKv4_VERSION: v4.13.2 ITKv5_VERSION: v5.0.0 ITK_SOURCE_DIR: $(Agent.BuildDirectory)/ITK-source ITK_BINARY_DIR: $(Agent.BuildDirectory)/ITK-build