Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Tests] Fix conan install of cpython #540

Merged
merged 1 commit into from Jul 28, 2022
Merged

[Tests] Fix conan install of cpython #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 15 additions & 7 deletions resources/build/bootstrap-ubuntu-20.04.sh
View file
Open in desktop
Expand Up @@ -10,13 +10,14 @@ sudo apt-get install -y build-essential pkgconf clang-format-12 clang-tidy-12 py
# These would be installed as part of the conan package install, but
# we're caching the conan directory via the `actions/cache` Github
# action, so a fresh Github VM is left without these system packages.
sudo apt-get install -y --no-install-recommends libfontenc-dev libx11-xcb-dev libxaw7-dev \
libxcb-dri3-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev \
libxcb-render-util0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev \
libxcb-xinerama0-dev libxcb-xkb-dev libxcomposite-dev libxcursor-dev libxdamage-dev \
libxfixes-dev libxi-dev libxinerama-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev \
libxres-dev libxss-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev uuid-dev \
libxkbfile-dev
sudo apt-get install -y --no-install-recommends libfontenc-dev libice-dev libsm-dev libx11-dev \
libx11-xcb-dev libxau-dev libxaw7-dev libxcb-dri3-dev libxcb-icccm4-dev libxcb-image0-dev \
libxcb-keysyms1-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev \
libxcb-shape0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinerama0-dev \
libxcb-xkb-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev \
libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev \
libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev \
libxxf86vm-dev uuid-dev xkb-data xtrans-dev

# Install additional build tools.
sudo pip3 install -r "$WORKSPACE/resources/build/requirements.txt"
Expand All @@ -32,7 +33,14 @@ conan profile new default --detect --force
conan profile update settings.compiler.libcxx=libstdc++ default
# Install openassetio third-party dependencies from public Conan Center
# package repo.
# TODO(DF): conan<1.51 (not yet released) has a bug that means we have
# to allow conan recipes to try to install system packages, even if the
# system packages are already available. In particular, this affects
# recent versions of the xorg/system recipe (a dependency of cpython).
# The problem is reported and fixed in https://github.com/conan-io/conan/pull/11712
conan install --install-folder "$CONAN_USER_HOME" --build=missing \
-c tools.system.package_manager:mode=install \
-c tools.system.package_manager:sudo=True \
"$WORKSPACE/resources/build"
# Ensure we have the expected version of clang-* available
sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-12 10
Expand Down
2 changes: 1 addition & 1 deletion resources/build/requirements.txt
View file
Open in desktop
@@ -1,4 +1,4 @@
conan==1.48.1
conan==1.50.0
cmake==3.21
ninja==1.10.2.3
cpplint==1.5.5