diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2022-08-09 08:31:03 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-08-10 11:18:20 +0000 |
| commit | 2659a0f18e832f4a18f868262163f277b1443db6 (patch) | |
| tree | db1bca0850b02ec35de78ca18058a9f33d713ccd /.gitlab-ci.yml | |
| parent | defbade7b98a1fe8b6b01c6783fc2078e46b2e9f (diff) | |
| download | dbus-2659a0f18e832f4a18f868262163f277b1443db6.tar.gz | |
gitlab-ci: Use GNU make on FreeBSD
The Makefile.am files contain % pattern rules that are not supported by
`make` (bmake) on FreeBSD. Since the replacing the patterns is non-trivial,
this commit updates the CI script to use GNU make when building on FreeBSD.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4df1b20..96c62c6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -415,7 +415,7 @@ freebsd image: # ones starting with ci_ to ci-build.sh manually. This works because # $(env | grep "ci_.*=") is evaluated on the current host not in the VM. # We also have to forward builddir since this is required by ci-build.sh. - - /app/vmctl exec "cd $CI_PROJECT_NAME && env builddir=$builddir $(echo $(env | grep "ci_.*=")) bash -x ./tools/ci-build.sh $CI_BUILD_ARGS" + - /app/vmctl exec "cd $CI_PROJECT_NAME && env make=gmake builddir=$builddir $(echo $(env | grep "ci_.*=")) bash -x ./tools/ci-build.sh $CI_BUILD_ARGS" # Copy build artifacts from the VM for archiving/JUnit XML display - mkdir -p "$builddir" - scp -v "vm:$CI_PROJECT_NAME/$builddir/config.h" . || true |