mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-28 11:00:09 +01:00
gitlab-ci: generate pages on Fedora 33 image
On one image we do extra work, like generating documentation (gitlab-pages). The same image is currently also used for the "checkpatch" step. That step checks code formatting using clang-format. The formatting depends on the clang version, and we currently choose Fedora 33 as the desired version for formatting. It means, the "checkpatch" step requires Fedora 33. We could choose a different image for generating pages and run check patch. However, that might not be best. Just also generate the pages using Fedora 33.
This commit is contained in:
parent
52c6891534
commit
b780f9315c
2 changed files with 4 additions and 4 deletions
|
|
@ -546,7 +546,6 @@ t_fedora:32:
|
|||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
- .nm_artifacts
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '32'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
|
|
@ -557,6 +556,7 @@ t_fedora:33:
|
|||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
- .nm_artifacts
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '33'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
|
|
@ -750,7 +750,7 @@ t_centos:8.1.1911:
|
|||
#################################################################
|
||||
checkpatch:
|
||||
extends:
|
||||
- t_fedora:32
|
||||
- t_fedora:33
|
||||
stage: test
|
||||
script:
|
||||
- date '+%Y%m%d-%H%M%S'; dnf install -y git black gettext /usr/bin/xargs which clang
|
||||
|
|
@ -771,7 +771,7 @@ pages:
|
|||
only:
|
||||
- master
|
||||
dependencies:
|
||||
- t_fedora:32
|
||||
- t_fedora:33
|
||||
|
||||
triage:issues:
|
||||
stage: triage
|
||||
|
|
|
|||
|
|
@ -52,4 +52,4 @@ distributions:
|
|||
# specifies which of the above distros is used as source for pages
|
||||
pages_build:
|
||||
name: fedora
|
||||
version: '32'
|
||||
version: '33'
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue