diff options
| author | Arun Raghavan <arun@asymptotic.io> | 2021-10-19 18:33:06 -0400 |
|---|---|---|
| committer | Arun Raghavan <arun@asymptotic.io> | 2021-10-20 11:16:19 -0400 |
| commit | e31340c243f034e26e1e876f3f32fc842f5e5b5b (patch) | |
| tree | 69c4f6088a11bdaf787dc22c85e494e593a11914 | |
| parent | 5a5aa66ada1f3e97d62cbd6843972bb427cbad65 (diff) | |
| download | webrtc-audio-processing-e31340c243f034e26e1e876f3f32fc842f5e5b5b.tar.gz | |
Add builds for distro and vendored versions of abseil
| -rw-r--r-- | .gitlab-ci.yml | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42cd589..2e2670f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: # CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES. # The tag is an arbitrary string that identifies the exact container # contents. - BASE_TAG: '2020-12-10.1' + BASE_TAG: '2021-10-19.1' FDO_DISTRIBUTION_VERSION: '20.10' FDO_UPSTREAM_REPO: 'pulseaudio/webrtc-audio-processing' @@ -43,10 +43,12 @@ include: FDO_DISTRIBUTION_PACKAGES: >- g++ gcc + git-core cmake libabsl-dev meson ninja-build + pkg-config python3-setuptools # Used to extend both container and build jobs @@ -76,24 +78,46 @@ build-container-aarch64: stage: container # Common build template -.build: +.build-distro-absl: stage: build extends: - .fdo.distribution-image@ubuntu script: - - meson build + - meson build --wrap-mode=nofallback - cd build - ninja artifacts: paths: - build/ -build-x86_64: +.build-vendored-absl: + stage: build + extends: + - .fdo.distribution-image@ubuntu + script: + - meson build --force-fallback-for=abseil-cpp + - cd build + - ninja + artifacts: + paths: + - build/ + +build-distro-absl-x86_64: + extends: + - .build-distro-absl + - .ubuntu-x86_64 + +build-vendored-absl-x86_64: extends: - - .build + - .build-vendored-absl - .ubuntu-x86_64 -build-aarch64: +build-distro-absl-aarch64: + extends: + - .build-distro-absl + - .ubuntu-aarch64 + +build-vendored-absl-aarch64: extends: - - .build + - .build-vendored-absl - .ubuntu-aarch64 |