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

Fix 32 bit CI builds #6170

Merged
merged 2 commits into from
Dec 22, 2021
Merged

Fix 32 bit CI builds #6170

merged 2 commits into from
Dec 22, 2021

Commits on Dec 11, 2021

  1. Fix Mason CMake installation 

    During the CI migration to Github Actions, a bug was introduced
such that Mason CMake is not being added to the PATH environment
variable correctly, so it defaults to the CMake installed in the
OS environment.

Simple fixing the typo fails as the Mason CMake version requires
libssl 1.0 as a dependency, whilst the Ubuntu Focal runners are
on the newer libssl 1.1. Therefore, we also bump the Mason
CMake version to 3.21.2.
    @mjjbell
    mjjbell committed Dec 11, 2021
    Configuration menu
    Copy the full SHA
    6643300 View commit details
    Browse the repository at this point in the history

  2. Fix CI 32-bit build 

    A recent change to the Ubuntu Focal CI worker - either a CMake upgrade,
or default installation of the libexpat-dev library - leads to the
32-bit expat library to not be found by CMake.

FindPackage(EXPAT) finds the library via pkg-config, so the fix is
to explicitly include the i386 pkg-config directory in the
PKG_CONFIG_PATH environment variable list.
    @mjjbell
    mjjbell committed Dec 11, 2021
    Configuration menu
    Copy the full SHA
    da2f47b View commit details
    Browse the repository at this point in the history