diff options
| author | Carlos O'Ryan <coryan@users.noreply.github.com> | 2020-01-15T22·44-0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15T22·44-0500 |
| commit | 20009f59de903d5a70038adee308020a82e3ecad (patch) | |
| tree | 864f0ab8dc88b48661be0bf10f281d1621737a19 /ci/test-install/compile-test-projects.sh | |
| parent | 7abccfa1ecc1a0d45673c25e4cfc33ebfb90c74e (diff) | |
ci: verify pkg-config files actually work (#30)
Change the CI builds to verify the pkg-config files we create actually work. Some improvements in the `.*ignore` files.
Diffstat (limited to 'ci/test-install/compile-test-projects.sh')
| -rwxr-xr-x | ci/test-install/compile-test-projects.sh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/ci/test-install/compile-test-projects.sh b/ci/test-install/compile-test-projects.sh index 47d612833eda..d5398f1e4490 100755 --- a/ci/test-install/compile-test-projects.sh +++ b/ci/test-install/compile-test-projects.sh @@ -19,13 +19,7 @@ set -eu -# For BigQuery protos -cp -R /home/build/cpp-cmakefiles/ci/test-install/bigquery \ - /home/build/test-install-bigquery -cd /home/build/test-install-bigquery -cmake -H. -Bcmake-out -cmake --build cmake-out -- -j "$(nproc)" -cmake-out/utilize-googleapis +# Verify the installed CMake config and pkgconfig files are actually usable. # For Bigtable protos cp -R /home/build/cpp-cmakefiles/ci/test-install/bigtable \ @@ -34,6 +28,18 @@ cd /home/build/test-install-bigtable cmake -H. -Bcmake-out cmake --build cmake-out -- -j "$(nproc)" cmake-out/utilize-googleapis +env PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig \ + make + +# For BigQuery protos +cp -R /home/build/cpp-cmakefiles/ci/test-install/bigquery \ + /home/build/test-install-bigquery +cd /home/build/test-install-bigquery +cmake -H. -Bcmake-out +cmake --build cmake-out -- -j "$(nproc)" +cmake-out/utilize-googleapis +env PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig \ + make # For spanner protos cp -R /home/build/cpp-cmakefiles/ci/test-install/spanner \ @@ -42,3 +48,5 @@ cd /home/build/test-install-spanner cmake -H. -Bcmake-out cmake --build cmake-out -- -j "$(nproc)" cmake-out/utilize-googleapis +env PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig \ + make |