[6.0] 13100b75d circleci: Catch up with 7.4
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Fri Jun 21 13:43:09 UTC 2024
commit 13100b75dbefd0d1da1d11bae9c786081fd130a7
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Wed Jun 19 14:51:43 2024 +0200
circleci: Catch up with 7.4
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
new file mode 100644
index 000000000..7553611e0
--- /dev/null
+++ b/.circleci/Dockerfile
@@ -0,0 +1,15 @@
+FROM centos:7
+
+RUN set -e;\
+ yum install -y epel-release; \
+ yum install -y \
+ automake \
+ git \
+ jemalloc-devel \
+ libedit-devel \
+ libtool \
+ libunwind-devel \
+ make \
+ pcre-devel \
+ python3 \
+ python-sphinx
diff --git a/.circleci/Dockerfile.alpine b/.circleci/Dockerfile.alpine
new file mode 100644
index 000000000..c09aa9d5a
--- /dev/null
+++ b/.circleci/Dockerfile.alpine
@@ -0,0 +1,20 @@
+FROM alpine
+
+RUN set -e; \
+ apk update; \
+ apk add -q \
+ autoconf \
+ automake \
+ build-base \
+ ca-certificates \
+ cpio \
+ git \
+ gzip \
+ libedit-dev \
+ libtool \
+ libunwind-dev \
+ linux-headers \
+ pcre-dev \
+ py-docutils \
+ py3-sphinx \
+ tar
diff --git a/.circleci/Dockerfile.archlinux b/.circleci/Dockerfile.archlinux
new file mode 100644
index 000000000..2b9201792
--- /dev/null
+++ b/.circleci/Dockerfile.archlinux
@@ -0,0 +1,15 @@
+FROM archlinux:base-devel
+
+RUN set -e; \
+ pacman -Sy --noconfirm \
+ ca-certificates \
+ cpio \
+ git \
+ libedit \
+ libtool \
+ libunwind \
+ linux-headers \
+ pcre \
+ python-docutils \
+ python-sphinx \
+ tar
diff --git a/.circleci/Dockerfile.ubuntu b/.circleci/Dockerfile.ubuntu
new file mode 100644
index 000000000..cc50bd3a0
--- /dev/null
+++ b/.circleci/Dockerfile.ubuntu
@@ -0,0 +1,22 @@
+FROM ubuntu
+
+RUN set -e; \
+ export DEBIAN_FRONTEND=noninteractive; \
+ export DEBCONF_NONINTERACTIVE_SEEN=true; \
+ apt-get update; \
+ apt-get install -y \
+ autoconf \
+ automake \
+ build-essential \
+ ca-certificates \
+ cpio \
+ git \
+ graphviz \
+ libedit-dev \
+ libjemalloc-dev \
+ libncurses-dev \
+ libpcre3-dev \
+ libtool \
+ libunwind-dev \
+ pkg-config \
+ python3-sphinx
diff --git a/.circleci/README.rst b/.circleci/README.rst
index 0c52c4235..e19a6485e 100644
--- a/.circleci/README.rst
+++ b/.circleci/README.rst
@@ -1,3 +1,8 @@
+..
+ Copyright (c) 2020 Varnish Software AS
+ SPDX-License-Identifier: BSD-2-Clause
+ See LICENSE file for full text of license
+
Multiarch building, testing & packaging
=======================================
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 97e0ac01a..056e597ee 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -45,8 +45,7 @@ jobs:
make \
pcre-devel \
python3 \
- python-sphinx \
- curl
+ python-sphinx
- checkout
- when:
condition: << pipeline.parameters.dist-url >>
@@ -234,7 +233,7 @@ jobs:
command: |
docker create --name workspace -v /workspace << parameters.prefix >><< parameters.dist >>:<< parameters.release >> /bin/true
docker cp /workspace workspace:/
- docker run --volumes-from workspace -w /workspace --network host << parameters.prefix >><< parameters.dist >>:<< parameters.release >> sh -c '
+ docker run --volumes-from workspace -w /workspace << parameters.prefix >><< parameters.dist >>:<< parameters.release >> sh -c '
case "<< parameters.dist >>" in
centos|almalinux|fedora)
yum groupinstall -y "Development Tools"
@@ -387,6 +386,11 @@ workflows:
name: build_centos_7
dist: centos
release: "7"
+ - build:
+ name: build_centos_stream
+ prefix: quay.io/centos/
+ dist: centos
+ release: stream
- build:
name: build_almalinux_8
dist: almalinux
@@ -395,6 +399,17 @@ workflows:
name: build_almalinux_9
dist: almalinux
release: "9"
+ # fedora is our witness
+ - build:
+ name: build_fedora_latest
+ dist: fedora
+ release: latest
+ make_target: witness.dot
+ - build:
+ name: build_fedora_rawhide
+ dist: fedora
+ release: rawhide
+ # latest debian uses sanitizers
- build:
name: build_debian_buster
dist: debian
@@ -407,8 +422,11 @@ workflows:
name: build_debian_bookworm
dist: debian
release: bookworm
+ extra_conf: --enable-asan --enable-ubsan --enable-workspace-emulator
+ # oldest ubuntu goes 32bit
- build:
name: build_ubuntu_bionic
+ prefix: i386/
dist: ubuntu
release: bionic
- build:
@@ -419,6 +437,15 @@ workflows:
name: build_ubuntu_jammy
dist: ubuntu
release: jammy
+ - build:
+ name: build_alpine
+ dist: alpine
+ release: "latest"
+ extra_conf: --without-contrib
+ - build:
+ name: build_archlinux
+ dist: archlinux
+ release: base-devel
packaging:
when: *packaging_cond
jobs: &packaging_jobs
@@ -432,7 +459,6 @@ workflows:
matrix:
parameters:
platform:
- - ubuntu:xenial
- ubuntu:bionic
- ubuntu:focal
- ubuntu:jammy
@@ -440,6 +466,7 @@ workflows:
- debian:bullseye
- debian:bookworm
- centos:7
+ - centos:stream
- almalinux:8
- almalinux:9
- fedora:latest
More information about the varnish-commit
mailing list