Merge pull request #1748 from thewtex/ci-vm-versions

ENH: Update CI testing virtual machine images
InsightSoftwareConsortium · Apr 6, 2020 · a476fa9 · a476fa9
2 parents 49cfbc2 + 136b8e4
commit a476fa9
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 25 deletions.
diff --git a/Modules/Core/Common/test/itkHashTableTest.cxx b/Modules/Core/Common/test/itkHashTableTest.cxx
@@ -79,19 +79,12 @@ itkHashTableTest(int, char *[])
   lookup(Set, "apple");
   lookup(Set, "durian");
 
-  Set.begin();
-  Set.end();
-  Set.size();
-  Set.max_size();
   // CppCheck gives us a warning if the return value isn't used.
   // This is to prevent the user from calling empty() when they mean clear().
   if (Set.empty())
     std::cout << "Set is empty." << std::endl;
-  Set.bucket_count();
   Set.rehash(50);
   Set.insert("the horror");
-  Set.count("apple");
-  Set.find("kiwi");
   auto                        hsh_it = Set.begin();
   HashSetType::const_iterator hst_const_it;
   hst_const_it = Set.end();
@@ -120,20 +113,13 @@ itkHashTableTest(int, char *[])
   std::cout << "june      -> " << months["june"] << std::endl;
   std::cout << "november  -> " << months["november"] << std::endl;
 
-  months.begin();
-  months.end();
-  months.size();
-  months.max_size();
   // CppCheck gives us a warning if the return value isn't used.
   // This is to prevent the user from calling empty() when they mean clear().
   if (months.empty())
     std::cout << "Set is empty." << std::endl;
-  months.bucket_count();
   months.rehash(50);
   HashMapType::value_type p("psychotic break", 2);
   months.insert(p);
-  months.count("january");
-  months.find("june");
   auto                        map_it = months.begin();
   HashMapType::const_iterator map_const_it;
   map_const_it = months.end();

diff --git a/Modules/IO/GE/src/itkGE5ImageIO.cxx b/Modules/IO/GE/src/itkGE5ImageIO.cxx
@@ -289,7 +289,7 @@ GE5ImageIO::ReadHeader(const char * FileNameToRead)
 
   // patient id
   std::string tmpId(buffer + VOff(84, 88), 13);
-  std::remove(tmpId.begin(), tmpId.end(), '-');
+  (void)std::remove(tmpId.begin(), tmpId.end(), '-');
   strncpy(curImage->patientId, tmpId.c_str(), sizeof(curImage->patientId) - 1);
   curImage->patientId[sizeof(curImage->patientId) - 1] = '\0';
 

diff --git a/Modules/Video/IO/include/itkVideoFileWriter.hxx b/Modules/Video/IO/include/itkVideoFileWriter.hxx
@@ -253,7 +253,7 @@ VideoFileWriter<TInputVideoStream>::InitializeOutputParameters()
   const VideoStreamType * input = this->GetInput();
 
   // Set dimensions
-  m_Dimensions.empty();
+  m_Dimensions.clear();
   typename FrameType::SizeType size = input->GetFrameLargestPossibleSpatialRegion(frameNum).GetSize();
   for (unsigned int i = 0; i < FrameType::ImageDimension; ++i)
   {

diff --git a/Testing/ContinuousIntegration/AzurePipelinesBatch.yml b/Testing/ContinuousIntegration/AzurePipelinesBatch.yml
@@ -97,7 +97,7 @@ jobs:
     timeoutInMinutes: 0
     cancelTimeoutInMinutes: 300
     pool:
-      vmImage: 'Ubuntu-16.04'
+      vmImage: 'Ubuntu-18.04'
 
     steps:
       - checkout: self

diff --git a/Testing/ContinuousIntegration/AzurePipelinesLinux.yml b/Testing/ContinuousIntegration/AzurePipelinesLinux.yml
@@ -12,7 +12,7 @@ jobs:
   timeoutInMinutes: 0
   cancelTimeoutInMinutes: 300
   pool:
-    vmImage: ubuntu-16.04
+    vmImage: ubuntu-18.04
   steps:
     - checkout: self
       clean: true

diff --git a/Testing/ContinuousIntegration/AzurePipelinesLinuxPython.yml b/Testing/ContinuousIntegration/AzurePipelinesLinuxPython.yml
@@ -12,7 +12,7 @@ jobs:
   timeoutInMinutes: 0
   cancelTimeoutInMinutes: 300
   pool:
-    vmImage: ubuntu-16.04
+    vmImage: ubuntu-18.04
   steps:
     - checkout: self
       clean: true

diff --git a/Testing/ContinuousIntegration/AzurePipelinesMacOS.yml b/Testing/ContinuousIntegration/AzurePipelinesMacOS.yml
@@ -12,7 +12,7 @@ jobs:
   timeoutInMinutes: 0
   cancelTimeoutInMinutes: 300
   pool:
-    vmImage: macOS-10.14
+    vmImage: macOS-10.15
   steps:
     - checkout: self
       clean: true

diff --git a/Testing/ContinuousIntegration/AzurePipelinesMacOSPython.yml b/Testing/ContinuousIntegration/AzurePipelinesMacOSPython.yml
@@ -12,7 +12,7 @@ jobs:
   timeoutInMinutes: 0
   cancelTimeoutInMinutes: 300
   pool:
-    vmImage: macOS-10.14
+    vmImage: macOS-10.15
   steps:
     - checkout: self
       clean: true

diff --git a/Testing/ContinuousIntegration/AzurePipelinesWindows.yml b/Testing/ContinuousIntegration/AzurePipelinesWindows.yml
@@ -12,7 +12,7 @@ jobs:
   timeoutInMinutes: 0
   cancelTimeoutInMinutes: 300
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
   steps:
     - checkout: self
       clean: true
@@ -56,7 +56,7 @@ jobs:
 
     - script: |
         cmake --version
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         ctest -S $(Agent.BuildDirectory)/ITK-dashboard/dashboard.cmake -VV -j 4
       displayName: 'Build and test'
       env:

diff --git a/Testing/ContinuousIntegration/AzurePipelinesWindowsPython.yml b/Testing/ContinuousIntegration/AzurePipelinesWindowsPython.yml
@@ -12,7 +12,7 @@ jobs:
   timeoutInMinutes: 0
   cancelTimeoutInMinutes: 300
   pool:
-    vmImage: 'vs2017-win2016'
+    vmImage: 'windows-2019'
   steps:
     - checkout: self
       clean: true
@@ -66,7 +66,7 @@ jobs:
 
     - script: |
         cmake --version
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" -vcvars_ver=14.2
         ctest -S $(Agent.BuildDirectory)/ITK-dashboard/dashboard.cmake -VV -j 4 -L Python
       displayName: 'Build and test'
       env: