repo: Use update_deps.py in ci jobs

Change-Id: Id7d72950c3b1459815fd5798daf59302463e1e64

diff --git a/.appveyor.yml b/.appveyor.yml
index 8c0a1d50f851c97e824bc6517af8404ca2bb7fd5..3f92bd67e42427c15324671e559898ce60271e1d 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,22 +26,15 @@ before_build:
   - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%"
   - echo.
   - echo Starting build for %APPVEYOR_REPO_NAME%
-  # Install Vulkan-Headers
-  - mkdir %TEMP%\headers
-  - git clone https://github.com/KhronosGroup/Vulkan-Headers.git %TEMP%\headers\repo
-  - ps: pushd $ENV:TEMP\headers\repo
-  - mkdir build
-  - cd build
-  - cmake -DCMAKE_INSTALL_PREFIX=%TEMP%\headers\install ..
-  - cmake --build . --target install
-  - ps: popd
+  # Install dependencies
+  - python scripts/update_deps.py --dir=external
   # Get Google Test
   - git clone https://github.com/google/googletest.git external/googletest
   # Generate build files using CMake for the build step.
   - echo Generating CMake files for %PLATFORM%
   - mkdir build
   - cd build
-  - cmake -A %PLATFORM% -DVULKAN_HEADERS_INSTALL_DIR=%TEMP%\headers\install ..
+  - cmake -A %PLATFORM% -C../external/helper.cmake ..
   - echo Building platform=%PLATFORM% configuration=%CONFIGURATION%
 
 platform:

diff --git a/.travis.yml b/.travis.yml
index 8000f2a43d65bdaf5471f83f3f311657b992f8af..79ad1cb134e78ac4c709736cdff5780365b41dfc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,13 +52,8 @@ before_install:
     fi
   - |
     if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]] || [[ "$VULKAN_BUILD_TARGET" == "MACOS" ]]; then
-      # Install Vulkan-Headers
-      mkdir /tmp/headers
-      git clone https://github.com/KhronosGroup/Vulkan-Headers.git /tmp/headers/repo
-      pushd /tmp/headers/repo
-      cmake . -DCMAKE_INSTALL_PREFIX=/tmp/headers/install
-      cmake --build . --target install
-      popd
+      # Install dependencies
+      python scripts/update_deps.py --dir=external
       # Get Google Test
       git clone https://github.com/google/googletest.git external/googletest
     fi
@@ -81,7 +76,7 @@ script:
       # Build Vulkan-Loader
       mkdir build
       cd build
-      cmake -DCMAKE_BUILD_TYPE=Debug -DVULKAN_HEADERS_INSTALL_DIR=/tmp/headers/install ..
+      cmake -DCMAKE_BUILD_TYPE=Debug -C../external/helper.cmake ..
       make -j $core_count
       cd ..
     fi