@@ -106,9 +106,6 @@ armhf-debian-cross-container:
hexagon-cross-container:
image: docker:stable
stage: containers
- except:
- variables:
- - $CI_PROJECT_NAMESPACE == 'qemu-project'
variables:
NAME: debian-hexagon-cross
GIT_DEPTH: 1
@@ -127,6 +124,10 @@ hexagon-cross-container:
- docker push "$TAG"
after_script:
- docker logout
+ rules:
+ - if: '$CI_PROJECT_NAMESPACE == "qemu-project"'
+ when: never
+ - when: on_success
hppa-debian-cross-container:
extends: .container_job_template
@@ -417,12 +417,14 @@ build-user-static:
MAKE_CHECK_ARGS: check-tcg
# Because the hexagon cross-compiler takes so long to build we don't rely
-# on the CI system to build it and hence this job has no dependency
-# declared. The image is manually uploaded.
+# on the CI system to build it. The image is manually uploaded.
build-user-hexagon:
extends: .native_build_job_template
needs:
- job: hexagon-cross-container
+ - job: hexagon-cross-container
+ # Only forks have the hexagon-cross-container job,
+ # keep it optional for mainstream.
+ optional: true
variables:
IMAGE: debian-hexagon-cross
TARGETS: hexagon-linux-user
Make the build-user-hexagon -> hexagon-cross-container optional to avoid on mainstream CI [*]: 'build-user-hexagon' job needs 'hexagon-cross-container' job but it was not added to the pipeline [*] https://gitlab.com/qemu-project/qemu/-/pipelines/309137207 Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- .gitlab-ci.d/containers.yml | 7 ++++--- .gitlab-ci.yml | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-)