From 613a4d435df6a44eb0e28b4b9961c69f562cd049 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Sun, 25 Jul 2021 16:15:31 +0200 Subject: [PATCH] Test CI --- .gitlab-ci.yml | 4 ++-- Tools/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd86635a..8733ea2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ build:linux_debug: - apt update -y # Otherwise libglib2 needs interaction - export DEBIAN_FRONTEND=noninteractive - - apt install curl zip unzip tar git pkg-config apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip build-essential libgl1-mesa-dev lld ninja-build cmake -y + - apt install mesa-common-dev curl zip unzip tar git pkg-config apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip build-essential libgl1-mesa-dev lld ninja-build cmake -y - pip3 install aqtinstall - mkdir Qt - aqt install --outputdir Qt/ 5.15.2 linux desktop @@ -120,7 +120,7 @@ build:linux_release: - apt update -y # Otherwise libglib2 needs interaction - export DEBIAN_FRONTEND=noninteractive - - apt install curl zip unzip tar git pkg-config apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip build-essential libgl1-mesa-dev lld ninja-build cmake -y + - apt install mesa-common-dev curl zip unzip tar git pkg-config apt-transport-https ca-certificates gnupg software-properties-common wget software-properties-common wget python3-pip build-essential libgl1-mesa-dev lld ninja-build cmake -y - pip3 install aqtinstall - mkdir Qt - aqt install --outputdir Qt/ 5.15.2 linux desktop diff --git a/Tools/setup.py b/Tools/setup.py index 2012d248..b0c824fe 100644 --- a/Tools/setup.py +++ b/Tools/setup.py @@ -61,7 +61,7 @@ if __name__ == "__main__": vcpkg_triplet = "x64-osx" elif sys.platform == "linux": vcpkg_command = "./vcpkg" - vcpkg_packages_list.append("infoware[opencl]") + vcpkg_packages_list.append("infoware[opengl]") execute("chmod +x bootstrap-vcpkg.sh", vcpkg_path) execute("./bootstrap-vcpkg.sh", vcpkg_path, False) execute("chmod +x vcpkg", vcpkg_path)