Azure: updated docker containers, added windows install scripts.

AcademySoftwareFoundation · Jul 23, 2019 · 9410823 · 9410823
1 parent 591b671
commit 9410823
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -30,32 +30,28 @@ jobs:
     matrix:
       CentOS 7 gcc VFX CY2019:
         agentImage: 'ubuntu-16.04'
-        containerImage: aswfstaging/ci-base:2019
+        containerImage: aswfstaging/ci-openexr:2019.0
         cxxCompiler: g++
         cCompiler: gcc
-        installSh: |
-          sudo share/ci/scripts/linux/install_cmake.sh 3.12.4
+        installSh: ''
 #      CentOS 7 gcc VFX CY2020:
 #        agentImage: 'ubuntu-16.04'
-#        containerImage: aswfstaging/ci-base:2020
+#        containerImage: aswfstaging/ci-openexr:2020.0
 #        cxxCompiler: g++
 #        cCompiler: gcc
-#        installSh: |
-#          sudo share/ci/scripts/linux/install_cmake.sh 3.12.4
+#        installSh: ''
       CentOS 7 Clang 7 VFX CY2019:
         agentImage: 'ubuntu-16.04'
-        containerImage: aswfstaging/ci-base:2019
+        containerImage: aswfstaging/ci-openexr:2019.0
         cxxCompiler: clang++
         cCompiler: clang
-        installSh: |
-          sudo share/ci/scripts/linux/install_cmake.sh 3.12.4
+        installSh: ''
 #      CentOS 7 Clang 7 VFX CY2020:
 #        agentImage: 'ubuntu-16.04'
-#        containerImage: aswfstaging/ci-base:2020
+#        containerImage: aswfstaging/ci-openexr:2020.0
 #        cxxCompiler: clang++
 #        cCompiler: clang
-#        installSh: |
-#          sudo share/ci/scripts/linux/install_cmake.sh 3.12.4
+#        installSh: ''
   pool:
     vmImage: $(agentImage)
   container: $[ variables['containerImage'] ]
@@ -93,11 +89,11 @@ jobs:
   condition: in(variables['Build.Reason'], 'Manual', 'Schedule')
   pool:
     vmImage: 'ubuntu-16.04'
-  container: aswfstaging/ci-base:2019
+  container: aswfstaging/ci-base:2019.0
 
   steps:
   - template: share/ci/templates/checkout.yml
-  - bash: sudo share/ci/scripts/linux/install_cmake.sh 3.12.4
+  - bash: ''
     displayName: Install dependencies
   - template: share/ci/templates/configure.yml
     parameters:
@@ -120,21 +116,21 @@ jobs:
 #        agentImage: 'macOS-10.13'
 #  pool:
 #    vmImage: $(agentImage)
-
+#
 #  steps:
 #  - template: share/ci/templates/checkout.yml
 #  - bash: |
 #      share/ci/scripts/macos/install.sh
 #      share/ci/scripts/macos/install_python.sh 2.7.16
 #    displayName: Install dependencies
-
+#
 #  - template: share/ci/templates/configure.yml
 #    parameters:
 #      cmakeOpts: |
 #        -DPYTHON_INCLUDE_DIR=$(python-config --prefix)/include/python2.7 \
 #        -DPYTHON_LIBRARY=$(python-config --prefix)/lib/libpython2.7.dylib \
 #        -DPYTHON_EXECUTABLE=$(which python2)
-
+#
 #  - template: share/ci/templates/build.yml
 #    parameters:
 #      cmakeOpts: -- -j4
@@ -156,12 +152,12 @@ jobs:
 #        buildSharedLibs: ON
 #  pool:
 #    vmImage: $(agentImage)
-
+#
 #  steps:
 #  - template: share/ci/templates/checkout.yml
 #  - powershell: |
 #      share/ci/scripts/windows/install_python.ps1 2.7.16
-#      share/ci/scripts/windows/install_cmake.ps1 3.14.4
+#      share/ci/scripts/windows/install_cmake.ps1 3.12.4
 #    displayName: Install dependencies
 #
 #  - template: share/ci/templates/configure.yml

diff --git a/share/ci/scripts/windows/install_cmake.ps1 b/share/ci/scripts/windows/install_cmake.ps1
@@ -0,0 +1,7 @@
+$cmakeVersion = $Args[0]
+$cmakeMajorMinor = [io.path]::GetFileNameWithoutExtension("$cmakeVersion")
+
+Invoke-WebRequest "https://cmake.org/files/v${cmakeMajorMinor}/cmake-${cmakeVersion}-win64-x64.zip" -OutFile "C:\cmake-${cmakeVersion}-win64-x64.zip"
+Expand-Archive "C:\cmake-${cmakeVersion}-win64-x64.zip" -DestinationPath C:\
+Rename-Item -Path "C:\cmake-${cmakeVersion}-win64-x64" -NewName C:\_cmake
+Write-Host "##vso[task.prependpath]C:\_cmake\bin"
diff --git a/share/ci/scripts/windows/install_python.ps1 b/share/ci/scripts/windows/install_python.ps1
@@ -0,0 +1,6 @@
+$pythonVersion = $Args[0]
+
+Invoke-WebRequest "https://www.python.org/ftp/python/${pythonVersion}/python-${pythonVersion}.amd64.msi" -OutFile "C:\python-${pythonVersion}.amd64.msi"
+msiexec /i "C:\python-${pythonVersion}.amd64.msi" /quiet /l* C:\_python.log TARGETDIR=C:\_python
+Write-Host "##vso[task.prependpath]C:\_python"
+Write-Host "##vso[task.prependpath]C:\_python\Scripts"
diff --git a/share/ci/templates/configure.yml b/share/ci/templates/configure.yml
@@ -26,7 +26,7 @@ steps:
     if [ "$CCOMPILER" ]; then
         export CC="$CCOMPILER"
     fi
-    /usr/local/bin/cmake ../. \
+    cmake ../. \
           -DCMAKE_INSTALL_PREFIX=../_install \
           -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} \
           -DCMAKE_CXX_STANDARD=${{ parameters.cxxStd }} \