diff options
author | Tomas Mraz <tomas@openssl.org> | 2023-06-06 11:48:36 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2023-06-10 22:34:42 +0200 |
commit | ab77026cecb7fed31e8df99655da1d0f302c4ccc (patch) | |
tree | 502166920ff00b9e6455d1f6c8832d0039d5f838 /.github | |
parent | 58e8af4cecd23dbea2e6b061ab68190b38d64145 (diff) |
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)
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/os-zoo.yml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml index 753c730ce9..ebdc20f4a5 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 |