add 9-stream target and test it daily

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 448539b80562a7c91d3b570de23e1e7798e26eaf..78165f1cff4afa0456fb1ecfe7cf29c21a853c6a 100644 (file)
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -18,6 +18,7 @@ jobs:
           - ubuntu-bionic
           - el-8
           - centos-8-stream
+          - centos-9-stream
           - debian-bullseye
           - ubuntu-jammy
       fail-fast: false

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index 099a755c9ccb6981c2e8553e4470f401c23eb41a..4ed620b40b931e4259cdc8ef8ac373313c490e2f 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -44,8 +44,10 @@ RUN touch /var/lib/rpm/* && if $(grep -q 'release 9' /etc/redhat-release); then
       dnf install -y re2 re2-devel --enablerepo=epel-testing; \
     fi
 
+# --allowerasing does not exist on el7, so we fall back to just installing
+# this is fine because --allowerasing is only there to deal with libcurl conflicting with libcurl-minimal on some el9 images
 RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \
-      yum install -y curl openssl-devel cmake && \
+      yum install -y --allowerasing curl libcurl openssl-devel cmake || yum install -y curl libcurl openssl-devel cmake && \
       curl -L https://github.com/h2o/h2o/archive/v2.2.6.tar.gz | tar xz && \
       CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.6 && \
       make install

diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-9-stream b/builder-support/dockerfiles/Dockerfile.target.centos-9-stream
new file mode 100644 (file)
index 0000000..873f63f
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-9-stream
@@ -0,0 +1,19 @@
+# First do the source builds
+@INCLUDE Dockerfile.target.sdist
+
+# This defines the distribution base layer
+# Put only the bare minimum of common commands here, without dev tools
+FROM quay.io/centos/centos:stream9 as dist-base
+
+ARG BUILDER_CACHE_BUSTER=
+
+RUN touch /var/lib/rpm/* && dnf install -y epel-release && \
+    dnf install -y 'dnf-command(config-manager)' && \
+    dnf config-manager --set-enabled crb
+
+# Do the actual rpm build
+@INCLUDE Dockerfile.rpmbuild
+
+# Do a test install and verify
+# Can be skipped with skiptests=1 in the environment
+# @EXEC [ "$skiptests" = "" ] && include Dockerfile.rpmtest