summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2019-06-17 13:18:36 +0200
committerAndrew Bartlett <abartlet@samba.org>2019-06-20 23:40:16 +0000
commit33cc2692510d6963ffb33d5cbb4233e1111f8928 (patch)
tree3482ad0d228ae6347f6bd4d6246e7a212d672e82 /.gitlab-ci.yml
parentb201dd33e0403d7259b91d4fcd4df2445703a34c (diff)
downloadsamba-33cc2692510d6963ffb33d5cbb4233e1111f8928.tar.gz
gitlab-ci: Add Fedora 30
Fedora 30 ships with gcc9. Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65d7ad659b9..7ac73546989 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: a50a08a6ecfbe1113f3892c0cb3e2646d58a1521
+ SAMBA_CI_CONTAINER_TAG: 563ddb220bfed37501be93b0b3204bb1ceb61b94
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -38,6 +38,7 @@ variables:
SAMBA_CI_CONTAINER_IMAGE_debian9: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-debian9:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_opensuse150: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-opensuse150:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_fedora29: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora29:${SAMBA_CI_CONTAINER_TAG}
+ SAMBA_CI_CONTAINER_IMAGE_fedora30: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-fedora30:${SAMBA_CI_CONTAINER_TAG}
SAMBA_CI_CONTAINER_IMAGE_centos7: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-centos7:${SAMBA_CI_CONTAINER_TAG}
include:
@@ -267,6 +268,10 @@ fedora29-samba-o3:
extends: .samba-o3-template
image: $SAMBA_CI_CONTAINER_IMAGE_fedora29
+fedora30-samba-o3:
+ extends: .samba-o3-template
+ image: $SAMBA_CI_CONTAINER_IMAGE_fedora30
+
#
# Keep the samba-o3 sections at the end ...
#