diff options
author | Sam Thursfield <sam@afuera.me.uk> | 2023-03-22 12:36:43 +0000 |
---|---|---|
committer | Sam Thursfield <sam@afuera.me.uk> | 2023-03-22 12:36:43 +0000 |
commit | e95dc8fab92aafda74d88b29c8ed5d4db5d20fb5 (patch) | |
tree | 9316a4e6c1829381931e3f8bacd5f221d30a276d | |
parent | 00e9909ada1a79ac775a99f1c089854f0cf7c074 (diff) | |
parent | 5fd01f34b3f96889169a844f3955586431f71924 (diff) | |
download | tracker-e95dc8fab92aafda74d88b29c8ed5d4db5d20fb5.tar.gz |
Merge branch 'wip/carlosg/ci-aarch64-rawhide' into 'master'
ci: Update stable fedora image to F37 and add rawhide@aarch64 tests
See merge request https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/586
-rw-r--r-- | .gitlab-ci.yml | 93 |
1 files changed, 74 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a473dc69e..096d96c38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -128,13 +128,13 @@ check-merge-request: .tracker.alpine@common: variables: - BASE_TAG: '2022-03-07.0' - FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3 py3-setuptools py3-tappy sqlite-dev gcovr' + BASE_TAG: '2023-03-21.1' + FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3 py3-setuptools py3-tappy sqlite-dev gcovr vala' -.tracker.fedora:35@x86_64: +.tracker.fedora:37@x86_64: extends: .tracker.fedora@common variables: - FDO_DISTRIBUTION_VERSION: 35 + FDO_DISTRIBUTION_VERSION: 37 FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}" .tracker.fedora:rawhide@x86_64: @@ -143,10 +143,18 @@ check-merge-request: FDO_DISTRIBUTION_VERSION: rawhide FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}" -.tracker.fedora:35@aarch64: +.tracker.fedora:37@aarch64: + extends: .tracker.fedora@common + variables: + FDO_DISTRIBUTION_VERSION: 37 + FDO_DISTRIBUTION_TAG: "aarch64-${BASE_TAG}" + tags: + - aarch64 + +.tracker.fedora:rawhide@aarch64: extends: .tracker.fedora@common variables: - FDO_DISTRIBUTION_VERSION: 35 + FDO_DISTRIBUTION_VERSION: rawhide FDO_DISTRIBUTION_TAG: "aarch64-${BASE_TAG}" tags: - aarch64 @@ -166,7 +174,7 @@ check-merge-request: build-fedora-container@x86_64: extends: - .fdo.container-build@fedora - - .tracker.fedora:35@x86_64 + - .tracker.fedora:37@x86_64 stage: prepare variables: GIT_STRATEGY: none @@ -191,7 +199,19 @@ build-fedora-rawhide-container@x86_64: build-fedora-container@aarch64: extends: - .fdo.container-build@fedora - - .tracker.fedora:35@aarch64 + - .tracker.fedora:37@aarch64 + stage: prepare + variables: + GIT_STRATEGY: none + needs: + - repo-sanity + - check-commit-log + - check-merge-request + +build-fedora-rawhide-container@aarch64: + extends: + - .fdo.container-build@fedora + - .tracker.fedora:rawhide@aarch64 stage: prepare variables: GIT_STRATEGY: none @@ -227,7 +247,7 @@ build-alpine-container@x86_64: check-code-style: extends: - .fdo.distribution-image@fedora - - .tracker.fedora:35@x86_64 + - .tracker.fedora:37@x86_64 needs: - build-fedora-container@x86_64 stage: code-review @@ -250,7 +270,7 @@ check-code-style: build-fedora@x86_64: extends: - .fdo.distribution-image@fedora - - .tracker.fedora:35@x86_64 + - .tracker.fedora:37@x86_64 needs: - build-fedora-container@x86_64 <<: *build @@ -267,7 +287,7 @@ build-fedora-rawhide@x86_64: build-fedora@aarch64: extends: - .fdo.distribution-image@fedora - - .tracker.fedora:35@aarch64 + - .tracker.fedora:37@aarch64 needs: - build-fedora-container@aarch64 allow_failure: true @@ -275,6 +295,17 @@ build-fedora@aarch64: NO_DOCS: "true" <<: *build +build-fedora-rawhide@aarch64: + extends: + - .fdo.distribution-image@fedora + - .tracker.fedora:rawhide@aarch64 + needs: + - build-fedora-rawhide-container@aarch64 + allow_failure: true + variables: + NO_DOCS: "true" + <<: *build + build-ubuntu-rolling@x86_64: extends: - .fdo.distribution-image@ubuntu @@ -314,7 +345,8 @@ build-alpine-latest@x86_64: - gcovr --root=.. --filter='\.\./src/' --exclude=../utils --exclude=../examples --exclude=../docs/reference --exclude='\.\./build/.*\.[ch]$' --exclude='.*/tests/.*\.[ch]$' - --json --print-summary --output=../coverage-${CI_JOB_NAME}.json 2>/dev/null + --merge-mode-functions=separate + --json --print-summary --output=../coverage-${CI_JOB_NAME}.json - popd - | echo "Distribution: " @@ -340,7 +372,7 @@ build-alpine-latest@x86_64: test-fedora@x86_64: extends: - .fdo.distribution-image@fedora - - .tracker.fedora:35@x86_64 + - .tracker.fedora:37@x86_64 needs: - build-fedora@x86_64 <<: *test @@ -362,12 +394,21 @@ test-fedora-rawhide@x86_64: test-fedora@aarch64: extends: - .fdo.distribution-image@fedora - - .tracker.fedora:35@aarch64 + - .tracker.fedora:37@aarch64 needs: - build-fedora@aarch64 allow_failure: true <<: *test +test-fedora-rawhide@aarch64: + extends: + - .fdo.distribution-image@fedora + - .tracker.fedora:rawhide@aarch64 + needs: + - build-fedora-rawhide@aarch64 + allow_failure: true + <<: *test + test-ubuntu@x86_64: extends: - .fdo.distribution-image@ubuntu @@ -387,7 +428,7 @@ test-alpine@x86_64: test-website: extends: - .fdo.distribution-image@fedora - - .tracker.fedora:35@x86_64 + - .tracker.fedora:37@x86_64 stage: test script: - export install_prefix="$(pwd)/tracker-install" @@ -407,17 +448,29 @@ test-website: needs: - build-fedora-container@x86_64 +test-soup2@x86_64: + extends: + - .fdo.distribution-image@fedora + - .tracker.fedora:37@x86_64 + needs: + - build-fedora@x86_64 + before_script: + - meson configure -Dsoup=soup2 build + <<: *test + coverage: extends: - .fdo.distribution-image@fedora - - .tracker.fedora:35@x86_64 + - .tracker.fedora:37@x86_64 stage: analysis allow_failure: true script: - mkdir coveragereport - gcovr --add-tracefile 'coverage-*.json' + --merge-mode-functions=separate --html-details --print-summary --output coveragereport/index.html - gcovr --add-tracefile 'coverage-*.json' + --merge-mode-functions=separate --xml --output coveragereport/coverage.xml coverage: '/^lines: (\d+\.\d+\%)/' artifacts: @@ -434,12 +487,14 @@ coverage: - test-fedora@x86_64 - test-fedora-rawhide@x86_64 - test-fedora@aarch64 + - test-fedora-rawhide@aarch64 - test-alpine@x86_64 + - test-soup2@x86_64 coverity: extends: - .fdo.distribution-image@fedora - - .tracker.fedora:35@x86_64 + - .tracker.fedora:37@x86_64 stage: analysis allow_failure: true script: @@ -465,7 +520,7 @@ coverity: static-scan: extends: - .fdo.distribution-image@fedora - - .tracker.fedora:35@x86_64 + - .tracker.fedora:37@x86_64 stage: analysis needs: - build-fedora-container@x86_64 @@ -480,7 +535,7 @@ static-scan: pages: extends: - .fdo.distribution-image@fedora - - .tracker.fedora:35@x86_64 + - .tracker.fedora:37@x86_64 stage: website script: - mv website public |