diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-06-24 14:15:27 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-07-13 20:36:13 +0100 |
| commit | 600926adce7ecc7d93af323749c7d02621f0cf08 (patch) | |
| tree | 8e71bc9a098ccf5bc0cf35c4f3ccd77678a20be3 /.gitlab-ci.yml | |
| parent | aaf0be63bdac30c4debf39ea7fcb17f480aef08f (diff) | |
| download | dbus-600926adce7ecc7d93af323749c7d02621f0cf08.tar.gz | |
CI: Consistently build in ./build
This will make it easier to capture log files. All our CI builds happen
in an expendable checkout, so we can safely remove and re-create ./build.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 698ddc4b..e973fd70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,6 +34,7 @@ stages: - build variables: + builddir: "build" ci_in_docker: "yes" ci_local_packages: "yes" ci_parallel: "2" @@ -82,11 +83,11 @@ variables: ci_buildsys: "meson" artifacts: reports: - junit: "$builddir/meson-logs/testlog.junit.xml" + junit: "build/meson-logs/testlog.junit.xml" name: "dbus-$CI_JOB_NAME" when: always paths: - - "$builddir/meson-logs/*.txt" + - "build/meson-logs/*.txt" windows amd64 image: stage: "build docker" @@ -180,8 +181,6 @@ debian meson: extends: - .meson-common - .debian-build - variables: - builddir: "ci-build-production-native" debian mingw32 autotools debug: extends: .debian-build @@ -266,7 +265,6 @@ opensuse mingw64 meson debug: ci_host: "x86_64-w64-mingw32" ci_local_packages: "no" ci_variant: "debug" - builddir: "ci-build-$ci_variant-$ci_host" .ubuntu-build: extends: .unix-host-build |