ci: Switch CI over to Fedora
Ubuntu/Debian absl are currently lagging. We should switch back to Debian once recent abseil lands in unstable/testing.
This commit is contained in:
parent
d090f7a927
commit
9b194c2d99
@ -29,8 +29,8 @@ variables:
|
|||||||
# CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES.
|
# CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES.
|
||||||
# The tag is an arbitrary string that identifies the exact container
|
# The tag is an arbitrary string that identifies the exact container
|
||||||
# contents.
|
# contents.
|
||||||
BASE_TAG: '2024-12-24.1'
|
BASE_TAG: '2024-12-26.0'
|
||||||
FDO_DISTRIBUTION_VERSION: '24.04'
|
FDO_DISTRIBUTION_VERSION: '41'
|
||||||
FDO_UPSTREAM_REPO: 'pulseaudio/webrtc-audio-processing'
|
FDO_UPSTREAM_REPO: 'pulseaudio/webrtc-audio-processing'
|
||||||
|
|
||||||
include:
|
include:
|
||||||
@ -40,10 +40,10 @@ include:
|
|||||||
# failures, this might be one cause.
|
# failures, this might be one cause.
|
||||||
- project: 'freedesktop/ci-templates'
|
- project: 'freedesktop/ci-templates'
|
||||||
ref: 'master'
|
ref: 'master'
|
||||||
file: '/templates/ubuntu.yml'
|
file: '/templates/fedora.yml'
|
||||||
|
|
||||||
# Common container build template
|
# Common container build template
|
||||||
.ubuntu-container-build:
|
.fedora-container-build:
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
|
GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
|
||||||
|
|
||||||
@ -56,19 +56,19 @@ include:
|
|||||||
gcc
|
gcc
|
||||||
git-core
|
git-core
|
||||||
cmake
|
cmake
|
||||||
libabsl-dev
|
abseil-cpp-devel
|
||||||
meson
|
meson
|
||||||
ninja-build
|
ninja-build
|
||||||
pkg-config
|
pkg-config
|
||||||
python3-setuptools
|
python3-setuptools
|
||||||
|
|
||||||
# Used to extend both container and build jobs
|
# Used to extend both container and build jobs
|
||||||
.ubuntu-x86_64:
|
.fedora-x86_64:
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_TAG: "x86_64-$BASE_TAG"
|
FDO_DISTRIBUTION_TAG: "x86_64-$BASE_TAG"
|
||||||
|
|
||||||
# Used to extend both container and build jobs
|
# Used to extend both container and build jobs
|
||||||
.ubuntu-aarch64:
|
.fedora-aarch64:
|
||||||
tags:
|
tags:
|
||||||
- aarch64
|
- aarch64
|
||||||
variables:
|
variables:
|
||||||
@ -76,23 +76,23 @@ include:
|
|||||||
|
|
||||||
build-container-x86_64:
|
build-container-x86_64:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.container-build@ubuntu@x86_64
|
- .fdo.container-build@fedora@x86_64
|
||||||
- .ubuntu-container-build
|
- .fedora-container-build
|
||||||
- .ubuntu-x86_64
|
- .fedora-x86_64
|
||||||
stage: container
|
stage: container
|
||||||
|
|
||||||
build-container-aarch64:
|
build-container-aarch64:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.container-build@ubuntu@aarch64
|
- .fdo.container-build@fedora@aarch64
|
||||||
- .ubuntu-container-build
|
- .fedora-container-build
|
||||||
- .ubuntu-aarch64
|
- .fedora-aarch64
|
||||||
stage: container
|
stage: container
|
||||||
|
|
||||||
# Common build template
|
# Common build template
|
||||||
.build-distro-absl:
|
.build-distro-absl:
|
||||||
stage: build
|
stage: build
|
||||||
extends:
|
extends:
|
||||||
- .fdo.distribution-image@ubuntu
|
- .fdo.distribution-image@fedora
|
||||||
script:
|
script:
|
||||||
- meson setup --wrap-mode=nofallback --prefix=/usr --libdir=lib builddir
|
- meson setup --wrap-mode=nofallback --prefix=/usr --libdir=lib builddir
|
||||||
- ninja -C builddir
|
- ninja -C builddir
|
||||||
@ -108,7 +108,7 @@ build-container-aarch64:
|
|||||||
.build-vendored-absl:
|
.build-vendored-absl:
|
||||||
stage: build
|
stage: build
|
||||||
extends:
|
extends:
|
||||||
- .fdo.distribution-image@ubuntu
|
- .fdo.distribution-image@fedora
|
||||||
script:
|
script:
|
||||||
- meson setup --force-fallback-for=abseil-cpp --prefix=/usr --libdir=lib builddir
|
- meson setup --force-fallback-for=abseil-cpp --prefix=/usr --libdir=lib builddir
|
||||||
- ninja -C builddir
|
- ninja -C builddir
|
||||||
@ -124,22 +124,22 @@ build-container-aarch64:
|
|||||||
build-distro-absl-x86_64:
|
build-distro-absl-x86_64:
|
||||||
extends:
|
extends:
|
||||||
- .build-distro-absl
|
- .build-distro-absl
|
||||||
- .ubuntu-x86_64
|
- .fedora-x86_64
|
||||||
|
|
||||||
build-vendored-absl-x86_64:
|
build-vendored-absl-x86_64:
|
||||||
extends:
|
extends:
|
||||||
- .build-vendored-absl
|
- .build-vendored-absl
|
||||||
- .ubuntu-x86_64
|
- .fedora-x86_64
|
||||||
|
|
||||||
build-distro-absl-aarch64:
|
build-distro-absl-aarch64:
|
||||||
extends:
|
extends:
|
||||||
- .build-distro-absl
|
- .build-distro-absl
|
||||||
- .ubuntu-aarch64
|
- .fedora-aarch64
|
||||||
|
|
||||||
build-vendored-absl-aarch64:
|
build-vendored-absl-aarch64:
|
||||||
extends:
|
extends:
|
||||||
- .build-vendored-absl
|
- .build-vendored-absl
|
||||||
- .ubuntu-aarch64
|
- .fedora-aarch64
|
||||||
|
|
||||||
# Update from:
|
# Update from:
|
||||||
# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-ci.yml
|
# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/blob/main/.gitlab-ci.yml
|
||||||
|
Loading…
x
Reference in New Issue
Block a user