RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

ci: Update docker to 1.6

Browse Source 
Bumps Windows VulkanSDK version to 1.2.154.1 to stay synchronised with
docker
This commit is contained in:
Ani 2020-10-29 01:14:52 +00:00
parent 3641926333
commit ea1cdbfdd8
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/setup-windows.sh
View File

@ -18,7 +18,7 @@ QT_DECL_URL="${QT_HOST}${QT_PREFIX}qtdeclarative${QT_SUFFIX}"
QT_TOOL_URL="${QT_HOST}${QT_PREFIX}qttools${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' 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' 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=" \ DEP_URLS=" \
$QT_BASE_URL \ $QT_BASE_URL \

8
.travis.yml
View File

@ -10,8 +10,8 @@ jobs:
services: docker services: docker
cache: ccache cache: ccache
compiler: gcc compiler: gcc
install: "docker pull rpcs3/rpcs3-travis-xenial:1.5" 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.5 /rpcs3/.ci/build-linux.sh' 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 - os: linux
dist: xenial dist: xenial
env: env:
@ -20,8 +20,8 @@ jobs:
services: docker services: docker
cache: ccache cache: ccache
compiler: clang compiler: clang
install: "docker pull rpcs3/rpcs3-travis-xenial:1.5" 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.5 /rpcs3/.ci/build-linux.sh' 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 # - os: freebsd
# compiler: clang # compiler: clang
# cache: ccache # cache: ccache

8
azure-pipelines.yml
View File

@ -31,13 +31,13 @@ jobs:
displayName: ccache displayName: ccache
- bash: | - bash: |
docker pull --quiet rpcs3/rpcs3-travis-xenial:1.5 docker pull --quiet rpcs3/rpcs3-travis-xenial:1.6
docker run \ docker run \
-v $(pwd):/rpcs3 \ -v $(pwd):/rpcs3 \
--env-file .ci/travis.env \ --env-file .ci/travis.env \
-v $CCACHE_DIR:/root/.ccache \ -v $CCACHE_DIR:/root/.ccache \
-v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
rpcs3/rpcs3-travis-xenial:1.5 \ rpcs3/rpcs3-travis-xenial:1.6 \
/rpcs3/.ci/build-linux.sh /rpcs3/.ci/build-linux.sh
displayName: Docker setup and build displayName: Docker setup and build
@ -51,8 +51,8 @@ jobs:
QT_VER: '5.14.2' QT_VER: '5.14.2'
QT_DATE: '202003291224' QT_DATE: '202003291224'
QTDIR: C:\Qt\$(QT_VER)\msvc2017_64 QTDIR: C:\Qt\$(QT_VER)\msvc2017_64
VULKAN_VER: '1.2.148.1' VULKAN_VER: '1.2.154.1'
VULKAN_SDK_SHA: '5dbeafbc75c334811720fb50bd6ed7c9afd42afd31cad6be0b84cd8383aa9472' VULKAN_SDK_SHA: 'b64471f3a720e649c1fae6535ea83b8c642655ebed1485bfdf15bf4d88f746d9'
VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER) VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)
CACHE_DIR: ./cache CACHE_DIR: ./cache