From ea1cdbfdd84f4ca1898291a5c6b2ec96adac7500 Mon Sep 17 00:00:00 2001
From: Ani <ani-leo@outlook.com>
Date: Thu, 29 Oct 2020 01:14:52 +0000
Subject: [PATCH] ci: Update docker to 1.6

Bumps Windows VulkanSDK version to 1.2.154.1 to stay synchronised with
docker
---
 .ci/setup-windows.sh | 2 +-
 .travis.yml          | 8 ++++----
 azure-pipelines.yml  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh
index 3752235ac7..05d4aec5f2 100755
--- a/.ci/setup-windows.sh
+++ b/.ci/setup-windows.sh
@@ -18,7 +18,7 @@ QT_DECL_URL="${QT_HOST}${QT_PREFIX}qtdeclarative${QT_SUFFIX}"
 QT_TOOL_URL="${QT_HOST}${QT_PREFIX}qttools${QT_SUFFIX}"
 LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win/llvmlibs_mt.7z'
 GLSLANG_URL='https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z'
-VULKAN_SDK_URL="https://www.dropbox.com/s/adanclixregbp2x/VulkanSDK-${VULKAN_VER}-Installer.exe"
+VULKAN_SDK_URL="https://www.dropbox.com/s/kn005de7gsv5whe/VulkanSDK-1.2.154.1-Installer.exe"
 
 DEP_URLS="         \
     $QT_BASE_URL   \
diff --git a/.travis.yml b/.travis.yml
index da6c6cfac8..8bb3b53479 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ jobs:
           services: docker
           cache: ccache
           compiler: gcc
-          install: "docker pull rpcs3/rpcs3-travis-xenial:1.5"
-          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.5 /rpcs3/.ci/build-linux.sh'
+          install: "docker pull rpcs3/rpcs3-travis-xenial:1.6"
+          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.6 /rpcs3/.ci/build-linux.sh'
         - os: linux
           dist: xenial
           env:
@@ -20,8 +20,8 @@ jobs:
           services: docker
           cache: ccache
           compiler: clang
-          install: "docker pull rpcs3/rpcs3-travis-xenial:1.5"
-          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.5 /rpcs3/.ci/build-linux.sh'
+          install: "docker pull rpcs3/rpcs3-travis-xenial:1.6"
+          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .ci/travis.env rpcs3/rpcs3-travis-xenial:1.6 /rpcs3/.ci/build-linux.sh'
         # - os: freebsd
         #   compiler: clang
         #   cache: ccache
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f809359d8b..c1358a9e05 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -31,13 +31,13 @@ jobs:
     displayName: ccache
 
   - bash: |
-      docker pull --quiet rpcs3/rpcs3-travis-xenial:1.5
+      docker pull --quiet rpcs3/rpcs3-travis-xenial:1.6
       docker run                      \
         -v $(pwd):/rpcs3              \
         --env-file .ci/travis.env \
         -v $CCACHE_DIR:/root/.ccache  \
         -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
-        rpcs3/rpcs3-travis-xenial:1.5 \
+        rpcs3/rpcs3-travis-xenial:1.6 \
         /rpcs3/.ci/build-linux.sh
     displayName: Docker setup and build
 
@@ -51,8 +51,8 @@ jobs:
     QT_VER: '5.14.2'
     QT_DATE: '202003291224'
     QTDIR: C:\Qt\$(QT_VER)\msvc2017_64
-    VULKAN_VER: '1.2.148.1'
-    VULKAN_SDK_SHA: '5dbeafbc75c334811720fb50bd6ed7c9afd42afd31cad6be0b84cd8383aa9472'
+    VULKAN_VER: '1.2.154.1'
+    VULKAN_SDK_SHA: 'b64471f3a720e649c1fae6535ea83b8c642655ebed1485bfdf15bf4d88f746d9'
     VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)
     CACHE_DIR: ./cache