diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml index 6c48e2983..cdd45ea45 100644 --- a/.github/workflows/contrib.yml +++ b/.github/workflows/contrib.yml @@ -13,6 +13,9 @@ jobs: strategy: matrix: include: + - name: admin/halog/ + targets: + - admin/halog/halog - name: dev/flags/ targets: - dev/flags/flags diff --git a/.github/workflows/fedora-rawhide.yml b/.github/workflows/fedora-rawhide.yml index 8eb111370..6f6802249 100644 --- a/.github/workflows/fedora-rawhide.yml +++ b/.github/workflows/fedora-rawhide.yml @@ -31,12 +31,6 @@ jobs: dnf -y install awk diffutils git pcre-devel zlib-devel pcre2-devel 'perl(FindBin)' perl-IPC-Cmd 'perl(File::Copy)' 'perl(File::Compare)' lua-devel socat findutils systemd-devel clang openssl-devel.x86_64 dnf -y install 'perl(FindBin)' 'perl(File::Compare)' perl-IPC-Cmd 'perl(File::Copy)' glibc-devel.i686 lua-devel.i686 lua-devel.x86_64 systemd-devel.i686 zlib-ng-compat-devel.i686 pcre-devel.i686 libatomic.i686 openssl-devel.i686 - uses: ./.github/actions/setup-vtest - - name: Build contrib tools - run: | - make admin/halog/halog - make dev/flags/flags - make dev/poll/poll - make dev/hpack/decode dev/hpack/gen-enc dev/hpack/gen-rht - name: Compile HAProxy with ${{ matrix.platform.cc }} run: | make -j3 CC=${{ matrix.platform.cc }} V=1 ERR=1 TARGET=linux-glibc DEBUG="-DDEBUG_POOL_INTEGRITY -DDEBUG_UNIT" USE_PROMEX=1 USE_OPENSSL=1 USE_QUIC=1 USE_ZLIB=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_LUA=1 ADDLIB="${{ matrix.platform.ADDLIB_ATOMIC }}" ARCH_FLAGS="${{ matrix.platform.ARCH_FLAGS }}" diff --git a/.github/workflows/vtest.yml b/.github/workflows/vtest.yml index a3132f831..49511e2da 100644 --- a/.github/workflows/vtest.yml +++ b/.github/workflows/vtest.yml @@ -118,15 +118,6 @@ jobs: ${{ join(matrix.FLAGS, ' ') }} \ ADDLIB="-Wl,-rpath,/usr/local/lib/ -Wl,-rpath,$HOME/opt/lib/" sudo make install-bin - - name: Compile admin/halog/halog - run: | - make -j$(nproc) admin/halog/halog \ - ERR=1 \ - TARGET=${{ matrix.TARGET }} \ - CC=${{ matrix.CC }} \ - DEBUG="-DDEBUG_POOL_INTEGRITY -DDEBUG_UNIT" \ - ${{ join(matrix.FLAGS, ' ') }} \ - ADDLIB="-Wl,-rpath,/usr/local/lib/ -Wl,-rpath,$HOME/opt/lib/" - name: Show HAProxy version id: show-version run: |