diff options
| author | Benjamin Berg <bberg@redhat.com> | 2021-09-15 17:23:00 +0200 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2021-09-15 17:23:00 +0200 |
| commit | 9356e895a21a6e03d413cabe72dafc160f00a5df (patch) | |
| tree | fbe61e2d00c6f7396cd4160c21586a2d998768d5 | |
| parent | 3c2883b99244a3065283bee39e5d6a0603f52c71 (diff) | |
ci: Reference image directly for forks
Otherwise forks will not find the image and things fall apart (due to
the method of how we build the image).
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f19d35..ca8587e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ variables: FDO_DISTRIBUTION_TAG: latest FDO_DISTRIBUTION_VERSION: rawhide FDO_UPSTREAM_REPO: "libfprint/$CI_PROJECT_NAME" + FEDORA_IMAGE: "$CI_REGISTRY/libfprint/$CI_PROJECT_NAME/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" BUNDLE: "org.freedesktop.libfprint.Demo.flatpak" LAST_ABI_BREAK: "056ea541ddc97f5806cffbd99a12dc87e4da3546" @@ -19,6 +20,8 @@ stages: - test - flatpak +image: $FEDORA_IMAGE + .build_one_driver_template: &build_one_driver script: # Build with a driver that doesn't need imaging, or nss @@ -39,7 +42,6 @@ stages: build: stage: build - extends: .fdo.distribution-image@fedora except: variables: - $CI_PIPELINE_SOURCE == "schedule" @@ -57,7 +59,6 @@ build: test: stage: test - extends: .fdo.distribution-image@fedora except: variables: - $CI_PIPELINE_SOURCE == "schedule" @@ -78,7 +79,6 @@ test: test_valgrind: stage: test - extends: .fdo.distribution-image@fedora except: variables: - $CI_PIPELINE_SOURCE == "schedule" @@ -97,7 +97,6 @@ test_valgrind: test_scan_build: stage: test - extends: .fdo.distribution-image@fedora except: variables: - $CI_PIPELINE_SOURCE == "schedule" @@ -113,7 +112,6 @@ test_scan_build: test_indent: stage: check-source - extends: .fdo.distribution-image@fedora except: variables: - $CI_PIPELINE_SOURCE == "schedule" @@ -124,7 +122,6 @@ test_indent: test_unsupported_list: stage: check-source - extends: .fdo.distribution-image@fedora except: variables: - $CI_PIPELINE_SOURCE == "schedule" |