From: Tomas Mraz <tomas@openssl.org>
Date: Tue, 6 Jun 2023 09:48:36 +0000 (+0200)
Subject: Fix failures of OS Zoo CI
X-Git-Tag: openssl-3.2.0-alpha1~676
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab77026cecb7fed31e8df99655da1d0f302c4ccc;p=thirdparty%2Fopenssl.git

Fix failures of OS Zoo CI

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Anton Arapov <anton@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21131)
---

diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml
index 753c730ce9b..ebdc20f4a54 100644
--- a/.github/workflows/os-zoo.yml
+++ b/.github/workflows/os-zoo.yml
@@ -29,11 +29,9 @@ jobs:
     steps:
     - name: install packages
       run: |
-        apk --no-cache add build-base perl linux-headers ${{ matrix.cc }}
+        apk --no-cache add build-base perl linux-headers git ${{ matrix.cc }}
 
     - uses: actions/checkout@v3
-    - name: checkout fuzz/corpora submodule
-      run: git submodule update --init --depth 1 fuzz/corpora
 
     - name: config
       run: |
@@ -46,7 +44,7 @@ jobs:
         fi
 
         CC=${{ matrix.cc }} ./config --banner=Configured no-shared \
-            -Wall -Werror enable-fips --strict-warnings -DOPENSSL_USE_IPV6=0 ${extra_cflags}
+            -Wall -Werror enable-fips enable-quic --strict-warnings -DOPENSSL_USE_IPV6=0 ${extra_cflags}
 
     - name: config dump
       run: ./configdata.pm --dump
@@ -59,10 +57,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [
-          macos-10.15,
           macos-11,
-          ubuntu-18.04,
+          macos-12,
+          macos-13,
           ubuntu-20.04,
+          ubuntu-22.04,
         ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -72,7 +71,7 @@ jobs:
     - name: config
       run: |
         CC=${{ matrix.zoo.cc }} ./config --banner=Configured \
-            -Wall -Werror --strict-warnings enable-fips
+            -Wall -Werror --strict-warnings enable-fips enable-quic
     - name: config dump
       run: ./configdata.pm --dump
     - name: make
@@ -100,7 +99,7 @@ jobs:
     - name: config
       working-directory: _build
       run: |
-        perl ..\Configure --banner=Configured no-makedepend enable-fips
+        perl ..\Configure --banner=Configured no-makedepend enable-fips enable-quic
     - name: config dump
       working-directory: _build
       run: ./configdata.pm --dump