[master] 51f122561 circleci: Add Fedora (latest and rawhide) jobs

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Feb 15 07:11:06 UTC 2022


commit 51f122561e4a72571a62da2711ccd7e04ac38fd2
Author: Guillaume Quintard <guillaume.quintard at gmail.com>
Date:   Mon Feb 14 15:41:02 2022 +0100

    circleci: Add Fedora (latest and rawhide) jobs
    
    But only fedora:latest has a packaging job.
    
    Better diff with the --ignore-all-space option.

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8262a1cc5..fcac45566 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -160,8 +160,8 @@ jobs:
             mkdir -p packages
             case "<< parameters.platform >>" in
                 debian:*|ubuntu:*)  EXT=deb ;;
-                centos:*)         EXT=rpm ;;
-                alpine:*)         EXT=apk ;;
+                centos:*|fedora:*)  EXT=rpm ;;
+                alpine:*)           EXT=apk ;;
                 *)
                     echo "unrecognized platform: << parameters.platform >>"
                     exit 1
@@ -219,16 +219,18 @@ jobs:
             docker create --name workspace -v /workspace << parameters.dist >>:<< parameters.release >> /bin/true
             docker cp /workspace workspace:/
             docker run --volumes-from workspace -w /workspace << parameters.dist >>:<< parameters.release >> sh -c '
-            if [ << parameters.dist >> = centos ]; then
-                if [ << parameters.release >> = 8 ]; then
-                    dnf install -y "dnf-command(config-manager)"
-                    yum config-manager --set-enabled powertools
-                    yum install -y diffutils python3-sphinx
-                else
-                    yum install -y python-sphinx
+            if [ << parameters.dist >> = centos -o << parameters.dist >> = fedora ]; then
+                yum groupinstall -y "Development Tools"
+                if [ << parameters.dist >> = centos ]; then
+                    if [ << parameters.release >> = 8 ]; then
+                        dnf install -y "dnf-command(config-manager)"
+                        yum config-manager --set-enabled powertools
+                        yum install -y diffutils
+                    fi
+                    yum install -y epel-release
                 fi
-                yum install -y epel-release
                 yum install -y \
+                    cpio \
                     automake \
                     git \
                     jemalloc-devel \
@@ -238,6 +240,7 @@ jobs:
                     make \
                     pcre2-devel \
                     python3 \
+                    /usr/bin/sphinx-build \
                     sudo
             elif [ << parameters.dist >> = debian -o << parameters.dist >> = ubuntu ]; then
                 export DEBIAN_FRONTEND=noninteractive
@@ -296,7 +299,7 @@ jobs:
 
             if [ << parameters.dist >> = archlinux ]; then
                 useradd varnish
-            elif [ << parameters.dist >> = centos ]; then
+            elif [ << parameters.dist >> = centos -o << parameters.dist >> = fedora ]; then
             	adduser varnish
             else
             	adduser --disabled-password --gecos "" varnish
@@ -350,6 +353,14 @@ workflows:
           name: distcheck_centos_8
           dist: centos
           release: "8"
+      - distcheck:
+          name: distcheck_fedora_latest
+          dist: fedora
+          release: latest
+      - distcheck:
+          name: distcheck_fedora_rawhide
+          dist: fedora
+          release: rawhide
       - distcheck:
           name: distcheck_debian_buster
           dist: debian
@@ -395,6 +406,7 @@ workflows:
                 - debian:stretch
                 - centos:7
                 - centos:8
+                - fedora:latest
                 - alpine:3
               rclass:
                 - arm.medium


More information about the varnish-commit mailing list