diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-07-24 11:04:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-07-24 11:04:57 +0100 |
| commit | a2376507f615495b1d16685449ce0ea78c2caf9d (patch) | |
| tree | 483549873eab9d2261e88da083a172c50fa2507c /.gitlab-ci.d | |
| parent | a146af86c8247f41b641783428b95ee71eb0e43f (diff) | |
| parent | cbc94d9702882128c52b72b252b8eb775b0e73af (diff) | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
Bugfixes.
# gpg: Signature made Sat 24 Jul 2021 07:11:18 BST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini-gitlab/tags/for-upstream:
qom: use correct field name when getting/setting alias properties
qapi: introduce forwarding visitor
gitlab: only let pages be published from default branch
MAINTAINERS: Add memory_mapping.h and memory_mapping.c to "Memory API"
MAINTAINERS: Add Peter Xu and myself as co-maintainer of "Memory API"
MAINTAINERS: Replace Eduardo as "Host Memory Backends" maintainer
i386: do not call cpudef-only models functions for max, host, base
target/i386: Added consistency checks for CR3
meson: fix dependencies for modinfo #2
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to '.gitlab-ci.d')
| -rw-r--r-- | .gitlab-ci.d/buildtest.yml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 89df51517c..80b57b7082 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -663,6 +663,17 @@ build-tools-and-docs-debian: # Prepare for GitLab pages deployment. Anything copied into the # "public" directory will be deployed to $USER.gitlab.io/$PROJECT +# +# GitLab publishes from any branch that triggers a CI pipeline +# +# For the main repo we don't want to publish from 'staging' +# since that content may not be pushed, nor do we wish to +# publish from 'stable-NNN' branches as that content is outdated. +# Thus we restrict to just the default branch +# +# For contributor forks we want to publish from any repo so +# that users can see the results of their commits, regardless +# of what topic branch they're currently using pages: image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest stage: test @@ -681,3 +692,10 @@ pages: artifacts: paths: - public + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + when: on_success + - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' + when: never + - if: '$CI_PROJECT_NAMESPACE != "qemu-project"' + when: on_success |