mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-05 11:08:03 +02:00
Use freedesktop/ci-templates for the GitLab CI
The CI templates include infrastructure to create docker images with all packages specified in tools/ci-install.sh. Using those docker images speeds up the CI since we don't have to install all the dependencies in every pipeline. We could extend this to also create containers that have mingw pre-installed but for now we only create an image with the dependencies that are required for every job.
This commit is contained in:
parent
c6aa71b5de
commit
4ce02f196b
1 changed files with 46 additions and 6 deletions
|
|
@ -20,6 +20,13 @@
|
|||
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
include:
|
||||
- project: 'freedesktop/ci-templates'
|
||||
ref: 957024f97e7b0f2cedc9ef29c6970fbeadd9326c
|
||||
file:
|
||||
- '/templates/debian.yml'
|
||||
- '/templates/opensuse.yml'
|
||||
|
||||
image: debian:bullseye-slim
|
||||
|
||||
stages:
|
||||
|
|
@ -45,8 +52,17 @@ variables:
|
|||
WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$UPSTREAM_BRANCH"
|
||||
WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$UPSTREAM_REPO/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$UPSTREAM_BRANCH"
|
||||
|
||||
.debian-vars:
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: 'bullseye-slim'
|
||||
FDO_DISTRIBUTION_TAG: '2022-04-17' # Bump this version on every ci-install.sh change
|
||||
|
||||
windows amd64 docker:
|
||||
.opensuse-vars:
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: 'leap'
|
||||
FDO_DISTRIBUTION_TAG: '2022-04-17' # Bump this version on every ci-install.sh change
|
||||
|
||||
windows amd64 image:
|
||||
stage: "build docker"
|
||||
variables:
|
||||
# this file needs to be relative to docker/windows/ subdir
|
||||
|
|
@ -88,9 +104,21 @@ windows amd64 docker:
|
|||
- chown -R user .
|
||||
- runuser -u user ./tools/ci-build.sh
|
||||
|
||||
debian image:
|
||||
extends:
|
||||
- .fdo.container-build@debian
|
||||
- .debian-vars
|
||||
variables:
|
||||
FDO_DISTRIBUTION_EXEC: './tools/ci-install.sh'
|
||||
stage: 'build docker'
|
||||
|
||||
.debian-build:
|
||||
extends: .unix-host-build
|
||||
image: "debian:bullseye-slim"
|
||||
needs: ["debian image"]
|
||||
extends:
|
||||
- .fdo.distribution-image@debian
|
||||
- .debian-vars
|
||||
- .unix-host-build
|
||||
stage: build
|
||||
|
||||
debian autotools production:
|
||||
extends: .debian-build
|
||||
|
|
@ -151,9 +179,21 @@ debian buster autotools:
|
|||
when: manual
|
||||
image: "debian:buster-slim"
|
||||
|
||||
opensuse image:
|
||||
extends:
|
||||
- .fdo.container-build@opensuse
|
||||
- .opensuse-vars
|
||||
variables:
|
||||
FDO_DISTRIBUTION_EXEC: './tools/ci-install.sh'
|
||||
stage: 'build docker'
|
||||
|
||||
.suse-build:
|
||||
extends: .unix-host-build
|
||||
image: "opensuse/leap:15"
|
||||
needs: ["opensuse image"]
|
||||
extends:
|
||||
- .fdo.distribution-image@opensuse
|
||||
- .opensuse-vars
|
||||
- .unix-host-build
|
||||
stage: build
|
||||
|
||||
opensuse cmake:
|
||||
extends: .suse-build
|
||||
|
|
@ -198,7 +238,7 @@ ubuntu jammy autotools:
|
|||
- 'windows'
|
||||
- '1809'
|
||||
needs:
|
||||
- "windows amd64 docker"
|
||||
- "windows amd64 image"
|
||||
timeout: '2h'
|
||||
before_script:
|
||||
- $ErrorActionPreference = "Stop"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue