Skip to content

Commit f66ed26

Browse files
committed
Unbreak the CI
1 parent b8bbcbe commit f66ed26

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

.github/workflows/example-project.yml

+12-3
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,25 @@ jobs:
6767
test "$(pkg-config --cflags example_project)" = "-I/usr/local/include/example-project-0.1"
6868
test "$(pkg-config --libs example_project)" = "-L/usr/local/lib -lexample-project"
6969
70-
- name: Test pkgconf
70+
- name: Install pkgconf
7171
if: startsWith(matrix.os, 'ubuntu')
7272
uses: awalsh128/cache-apt-pkgs-action@latest
7373
with:
7474
packages: pkgconf
75+
76+
- name: Test pkgconf
77+
if: startsWith(matrix.os, 'ubuntu')
7578
run: |
7679
set -x
80+
pkgconf --version
81+
pkg-config --version
7782
ARCHDIR=`dpkg-architecture -qDEB_HOST_MULTIARCH`
78-
test "$(pkgconf --cflags example_project)" = "-I/usr/local/include/example-project-0.1"
79-
test "$(pkgconf --libs example_project)" = "-L/usr/local/lib/${ARCHDIR} -lexample-project"
83+
# ubuntu seems to add trailing spaces for no specific reasons.
84+
CFLAGS=$(pkgconf --cflags example_project)
85+
LIBS=$(pkgconf --libs example_project)
86+
87+
test "${CFLAGS%% }" = "-I/usr/local/include/example-project-0.1"
88+
test "${LIBS%% }" = "-L/usr/local/lib/${ARCHDIR} -lexample-project"
8089
8190
- name: Update dynamic linker cache
8291
if: startsWith(matrix.os, 'ubuntu')

0 commit comments

Comments
 (0)