diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2021-05-21 12:24:53 +0200 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2021-05-21 15:31:19 +0200 |
commit | 51753739eaaa862dd2b4317bc24276764a60b3e6 (patch) | |
tree | 600bd7a65fdd50cf9589f2be0ee96a5d638aaa2b | |
parent | b424297636e9a2667b45c58cf32e69c233b85b42 (diff) | |
download | tracker-wip/carlosg/ci-playground2.tar.gz |
squash!wip/carlosg/ci-playground2
-rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cb98c926..0b13fa9a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ check-merge-request: variables: BASE_TAG: '2021-05-15.9' FDO_UPSTREAM_REPO: GNOME/tracker - FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip umockdev-devel xmlto' + FDO_DISTRIBUTION_PACKAGES: 'bash clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip umockdev-devel xmlto' FDO_DISTRIBUTION_EXEC: | dnf install -y 'dnf-command(builddep)' && dnf builddep -y tracker tracker-miners --setopt=install_weak_deps=False && @@ -146,6 +146,8 @@ build-fedora-container@aarch64: stage: prepare variables: GIT_STRATEGY: none + tags: + - aarch64 needs: - check-commit-log - check-merge-request @@ -175,6 +177,7 @@ build-alpine-container@x86_64: .build-template: &build stage: build script: + - echo "I'm running on $FDO_DISTRIBUTION_TAG" - meson . build -Db_lto=true -Db_coverage=true -Dsystemd_user_services=false -Dtests_tap_protocol=true --prefix /usr - ninja -C build artifacts: @@ -205,7 +208,17 @@ build-fedora@aarch64: needs: - build-fedora-container@aarch64 allow_failure: true - <<: *build + stage: build + variables: + FDO_DISTRIBUTION_TAG: "aarch64-$BASE_TAG" + FDO_DISTRIBUTION_VERSION: 34 + CI_DEBUG_TRACE: "true" + script: + - echo "I'm running on $FDO_DISTRIBUTION_TAG" + artifacts: + expire_in: 1 day + paths: + - build build-ubuntu-rolling@x86_64: extends: |