diff options
| author | Tony-LunarG <tony@lunarg.com> | 2018-09-17 11:34:24 -0600 |
|---|---|---|
| committer | Tony Barbour <tony@lunarg.com> | 2018-09-17 15:52:47 -0600 |
| commit | f2c941819838c349fe0cc8eb2dddac294fe012e9 (patch) | |
| tree | cfb7d9c2b681ce3675ccdc6cdde5e4a2866530f7 | |
| parent | d8052a0d9feb3e4f8b60ce1fadeb4a6e726d2c75 (diff) | |
| download | usermoji-f2c941819838c349fe0cc8eb2dddac294fe012e9.tar.xz | |
cube: Use working url to fetch glslang binaries
Change-Id: I6157cf2210c1249ce9a6bcf0ed6279597b16a53f
| -rw-r--r-- | .appveyor.yml | 9 | ||||
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | scripts/fetch_glslangvalidator.py | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index f94d814f..281eb2e5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,15 +24,6 @@ branches: before_build: - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%" - # Get a prebuilt shader compiler (glslangValidator) so that we don't have to build all of glslang - - mkdir glslang - - cd glslang - - curl -fsSL -o glslang-master-windows-x64-Release.zip https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-windows-x64-Release.zip - - 7z x glslang-master-windows-x64-Release.zip - - cd .. - - "SET PATH=%APPVEYOR_BUILD_FOLDER%\\glslang\\bin;%PATH%" - - glslangValidator.exe --version - - echo. - echo Starting build for %APPVEYOR_REPO_NAME% in %APPVEYOR_BUILD_FOLDER% # Build Vulkan-Headers - echo Building Vulkan-Headers for %PLATFORM% %CONFIGURATION% diff --git a/.travis.yml b/.travis.yml index e2132dc2..55751a9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,14 +46,6 @@ before_install: # Install the appropriate Linux packages. sudo apt-get -qq update sudo apt-get -y install libxkbcommon-dev libwayland-dev libmirclient-dev libxrandr-dev libx11-xcb-dev - # Get a prebuilt shader compiler (glslangValidator) so that we don't have to build all of glslang - mkdir glslang - cd glslang - wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip - unzip -u -q glslang-master-linux-Release.zip - cd .. - export PATH=${TRAVIS_BUILD_DIR}/glslang/bin:$PATH - glslangValidator --version fi - | if [[ "$VULKAN_BUILD_TARGET" == "ANDROID" ]]; then diff --git a/scripts/fetch_glslangvalidator.py b/scripts/fetch_glslangvalidator.py index 5da8a677..d5a07be9 100755 --- a/scripts/fetch_glslangvalidator.py +++ b/scripts/fetch_glslangvalidator.py @@ -35,7 +35,7 @@ import zipfile SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__)) REPO_DIR = os.path.join(SCRIPTS_DIR, '..') -GLSLANG_URL = "https://github.com/KhronosGroup/glslang/releases/download/master-tot" +GLSLANG_URL = "https://github.com/KhronosGroup/glslang/releases/download/7.9.2888" if __name__ == '__main__': if len(sys.argv) != 2: |