From 2c81083406b996f1a28bb0433262f062f401728d Mon Sep 17 00:00:00 2001 From: Michael Bell Date: Sat, 11 Dec 2021 16:52:53 +0000 Subject: [PATCH] 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. --- .github/workflows/osrm-backend.yml | 1 + CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 1ce58a297..8710fa2d6 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -471,6 +471,7 @@ jobs: fi elif [[ $TARGET_ARCH == "i686" ]]; then source ./scripts/ci/before_install.${TARGET_ARCH}.sh + echo "PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:${PKG_CONFIG_PATH}" >> $GITHUB_ENV fi - name: Prepare build diff --git a/CHANGELOG.md b/CHANGELOG.md index fbd505b01..d54a474a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ - CHANGED: Upgrade Ubuntu CI builds to 20.04 [#6119](https://github.com/Project-OSRM/osrm-backend/pull/6119) - CHANGED: Make building osrm-routed optional [#6144](https://github.com/Project-OSRM/osrm-backend/pull/6144) - FIXED: Run all unit tests in CI [#5248](https://github.com/Project-OSRM/osrm-backend/pull/5248) - - FIXED: Fix installation of Mason CMake [#6170](https://github.com/Project-OSRM/osrm-backend/pull/6170) + - FIXED: Fix installation of Mason CMake and 32 bit CI build [#6170](https://github.com/Project-OSRM/osrm-backend/pull/6170) # 5.26.0 - Changes from 5.25.0