From 4401ad6747c4970e269a7fc18a462c3cf477ccaa Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 9 Nov 2019 16:43:10 +0100 Subject: [PATCH] Fix CI --- .travis/build-linux.bash | 2 +- .travis/build-mac.bash | 2 +- appveyor.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis/build-linux.bash b/.travis/build-linux.bash index dd991b5f53..c07a4bfd30 100644 --- a/.travis/build-linux.bash +++ b/.travis/build-linux.bash @@ -8,7 +8,7 @@ export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib cd rpcs3 -git submodule update --quiet --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng 3rdparty/cereal 3rdparty/hidapi 3rdparty/xxHash 3rdparty/yaml-cpp 3rdparty/libusb 3rdparty/FAudio Vulkan/glslang +git submodule update --quiet --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/span 3rdparty/libpng 3rdparty/cereal 3rdparty/hidapi 3rdparty/xxHash 3rdparty/yaml-cpp 3rdparty/libusb 3rdparty/FAudio Vulkan/glslang # Download pre-compiled llvm libs curl -sLO https://github.com/RPCS3/llvm/releases/download/continuous-linux-master/llvmlibs-linux.tar.gz diff --git a/.travis/build-mac.bash b/.travis/build-mac.bash index 6b16765045..bc3b7d430b 100644 --- a/.travis/build-mac.bash +++ b/.travis/build-mac.bash @@ -15,7 +15,7 @@ cp target/release/libportability.dylib vulkan-sdk/lib/libVulkan.dylib install_name_tool -id ${PWD}/vulkan-sdk/lib/libVulkan.dylib vulkan-sdk/lib/libVulkan.dylib export VULKAN_SDK=${PWD}/vulkan-sdk -git submodule update --quiet --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng 3rdparty/cereal 3rdparty/hidapi 3rdparty/libusb 3rdparty/xxHash 3rdparty/yaml-cpp 3rdparty/FAudio Vulkan/glslang +git submodule update --quiet --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/span 3rdparty/libpng 3rdparty/cereal 3rdparty/hidapi 3rdparty/libusb 3rdparty/xxHash 3rdparty/yaml-cpp 3rdparty/FAudio Vulkan/glslang mkdir build; cd build cmake .. -DWITH_LLVM=OFF -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja diff --git a/appveyor.yml b/appveyor.yml index fd65e62f02..3eee007874 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,7 +47,7 @@ install: git submodule -q update --init ` 3rdparty/cereal ` 3rdparty/ffmpeg ` - 3rdparty/GSL ` + 3rdparty/span ` 3rdparty/hidapi ` 3rdparty/libpng ` 3rdparty/libusb `