depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ci: Switch to newer CI templates

Browse source
This commit is contained in:
Benjamin Berg 2021-09-15 14:13:05 +02:00
parent d763f8f41a
commit eb568a62aa
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.gitlab-ci.yml
View file

@ -1,6 +1,6 @@
include: include:
- local: '.gitlab-ci/libfprint-templates.yaml' - local: '.gitlab-ci/libfprint-templates.yaml'
- project: 'wayland/ci-templates' - project: 'freedesktop/ci-templates'
ref: master ref: master
file: '/templates/fedora.yml' file: '/templates/fedora.yml'
- remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/master/flatpak/flatpak_ci_initiative.yml' - remote: 'https://gitlab.gnome.org/GNOME/citemplates/-/raw/master/flatpak/flatpak_ci_initiative.yml'
@ -9,7 +9,7 @@ variables:
extends: .libfprint_common_variables extends: .libfprint_common_variables
FDO_DISTRIBUTION_TAG: latest FDO_DISTRIBUTION_TAG: latest
FDO_DISTRIBUTION_VERSION: rawhide FDO_DISTRIBUTION_VERSION: rawhide
FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME"
BUNDLE: "org.freedesktop.libfprint.Demo.flatpak" BUNDLE: "org.freedesktop.libfprint.Demo.flatpak"
LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546" LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546"
@ -19,8 +19,6 @@ stages:
- test - test
- flatpak - flatpak
image: "$FEDORA_IMAGE"
.build_one_driver_template: &build_one_driver .build_one_driver_template: &build_one_driver
script: script:
# Build with a driver that doesn't need imaging, or nss # Build with a driver that doesn't need imaging, or nss
@ -41,6 +39,7 @@ image: "$FEDORA_IMAGE"
build: build:
stage: build stage: build
extends: .fdo.distribution-image@fedora
except: except:
variables: variables:
- $CI_PIPELINE_SOURCE == "schedule" - $CI_PIPELINE_SOURCE == "schedule"
@ -58,6 +57,7 @@ build:
test: test:
stage: test stage: test
extends: .fdo.distribution-image@fedora
except: except:
variables: variables:
- $CI_PIPELINE_SOURCE == "schedule" - $CI_PIPELINE_SOURCE == "schedule"
@ -78,6 +78,7 @@ test:
test_valgrind: test_valgrind:
stage: test stage: test
extends: .fdo.distribution-image@fedora
except: except:
variables: variables:
- $CI_PIPELINE_SOURCE == "schedule" - $CI_PIPELINE_SOURCE == "schedule"
@ -96,6 +97,7 @@ test_valgrind:
test_scan_build: test_scan_build:
stage: test stage: test
extends: .fdo.distribution-image@fedora
except: except:
variables: variables:
- $CI_PIPELINE_SOURCE == "schedule" - $CI_PIPELINE_SOURCE == "schedule"
@ -111,6 +113,7 @@ test_scan_build:
test_indent: test_indent:
stage: check-source stage: check-source
extends: .fdo.distribution-image@fedora
except: except:
variables: variables:
- $CI_PIPELINE_SOURCE == "schedule" - $CI_PIPELINE_SOURCE == "schedule"
@ -121,6 +124,7 @@ test_indent:
test_unsupported_list: test_unsupported_list:
stage: check-source stage: check-source
extends: .fdo.distribution-image@fedora
except: except:
variables: variables:
- $CI_PIPELINE_SOURCE == "schedule" - $CI_PIPELINE_SOURCE == "schedule"
@ -159,6 +163,7 @@ container_fedora_build:
- $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES" - $CI_PIPELINE_SOURCE == "schedule" && $CRON_TASK == "BUILD_CI_IMAGES"
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
FDO_FORCE_REBUILD: 1
# a list of packages to install # a list of packages to install
FDO_DISTRIBUTION_PACKAGES: FDO_DISTRIBUTION_PACKAGES:
$LIBFPRINT_DEPENDENCIES $LIBFPRINT_DEPENDENCIES