From 325d003c7866d339a50b7e54d559e794577517d9 Mon Sep 17 00:00:00 2001 From: DMG Date: Tue, 12 Nov 2024 14:12:20 -0800 Subject: [PATCH] linux.yaml RedHat experiment --- .github/workflows/linux.yaml | 8 +++++--- version.txt | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index 7d0695302..2d74306d2 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -57,7 +57,7 @@ jobs: run: | if [ ${{ matrix.compiler }} = gcc ]; then compiler=g++; else compiler="clang lld ?exact-name(libclang-rt-dev)"; fi apt -y update - apt -y install $compiler meson pkg-config cmake rapidjson-dev libssl-dev netbase '?exact-name(libhowardhinnant-date-dev)' '?exact-name(libgmock-dev) (?version([1-9]\.[1-9][1-9]) | ?version([1-9]\.[2-9][0-9]))' '?exact-name(libcpp-httplib-dev)' libcurl4-openssl-dev git ca-certificates curl gpg gpgv gpg-agent lcov llvm-dev --no-install-recommends + apt -y install $compiler meson pkg-config cmake brotli libbrotli-dev zstd libzstd-dev rapidjson-dev libssl-dev netbase '?exact-name(libhowardhinnant-date-dev)' '?exact-name(libgmock-dev) (?version([1-9]\.[1-9][1-9]) | ?version([1-9]\.[2-9][0-9]))' '?exact-name(libcpp-httplib-dev)' libcurl4-openssl-dev git ca-certificates curl gpg gpgv gpg-agent lcov llvm-dev --no-install-recommends # Periodically, debian:testing fails with clang, saying that # libstdc++ cannot be found. In debian:testing/clang, normally @@ -79,7 +79,9 @@ jobs: if: contains(matrix.os, 'redhat') run: | if [ ${{ matrix.compiler }} = gcc ]; then compiler=gcc-c++; else compiler=llvm-toolset; fi - microdnf -y install $compiler lld pkgconf cmake openssl-devel zlib-devel libcurl-devel git python3-pip unzip + microdnf -y install $compiler lld pkgconf cmake brotli brotli-devel zstd libzstd-devel openssl-devel zlib-devel libcurl-devel git python3-pip unzip +# !!!!!!!! +# if [ ${{ os }} = 'registry.access.redhat.com/ubi8/ubi-minimal' ]; then microdnf -y install brotli-devel; else microdnf -y install libbrotli; fi curl -LO https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip unzip ninja-linux.zip mv ninja /usr/local/bin @@ -95,7 +97,7 @@ jobs: if [ ${{ matrix.compiler }} = gcc ]; then CXX=g++; else CXX=clang++ CXX_LD=lld; fi export CXX CXX_LD meson setup build \ - -DPISTACHE_BUILD_TESTS=true -DPISTACHE_USE_SSL=${{ matrix.tls }} -DPISTACHE_USE_CONTENT_ENCODING_DEFLATE=true \ + -DPISTACHE_BUILD_TESTS=true -DPISTACHE_USE_SSL=${{ matrix.tls }} -DPISTACHE_USE_CONTENT_ENCODING_DEFLATE=true -DPISTACHE_USE_CONTENT_ENCODING_BROTLI=true -DPISTACHE_USE_CONTENT_ENCODING_ZSTD=true \ --buildtype=debug -Db_coverage=true -Db_sanitize=${{ matrix.sanitizer }} -Db_lundef=false \ || (cat build/meson-logs/meson-log.txt ; false) env: diff --git a/version.txt b/version.txt index 425322ed1..a35f796a8 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.4.17.20241111 +0.4.17.20241112