Skip to content

Commit 3bc7522

Browse files
committed
CI: extend Fedora Rawhide, add m32 mode
hopefully it will allow to catch regressions like this haproxy@e41638a
1 parent 1a088da commit 3bc7522

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

.github/workflows/fedora-rawhide.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@ jobs:
1111
build_and_test:
1212
strategy:
1313
matrix:
14-
cc: [ gcc, clang ]
15-
name: ${{ matrix.cc }}
14+
platform: [
15+
{ name: x64, cc: gcc, QUICTLS_EXTRA_ARGS: "", ADDLIB_ATOMIC: "", DEBUG_CFLAGS: "", LDFLAGS: "" },
16+
{ name: x64, cc: clang, QUICTLS_EXTRA_ARGS: "", ADDLIB_ATOMIC: "", DEBUG_CFLAGS: "", LDFLAGS: "" },
17+
{ name: x86, cc: gcc, QUICTLS_EXTRA_ARGS: "-m32 linux-generic32", ADDLIB_ATOMIC: "-latomic", DEBUG_CFLAGS: "-m32", LDFLAGS: "-m32" },
18+
{ name: x86, cc: clang, QUICTLS_EXTRA_ARGS: "-m32 linux-generic32", ADDLIB_ATOMIC: "-latomic", DEBUG_CFLAGS: "-m32", LDFLAGS: "-m32" }
19+
]
20+
name: ${{ matrix.platform.cc }}.${{ matrix.platform.name }}
1621
runs-on: ubuntu-latest
1722
if: ${{ github.repository_owner == 'haproxy' }}
1823
container:
@@ -21,20 +26,21 @@ jobs:
2126
- uses: actions/checkout@v4
2227
- name: Install dependencies
2328
run: |
24-
dnf -y install 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
29+
dnf -y install 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
30+
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
2531
- name: Install VTest
2632
run: scripts/build-vtest.sh
2733
- name: Install QuicTLS
28-
run: QUICTLS=yes scripts/build-ssl.sh
34+
run: QUICTLS=yes QUICTLS_EXTRA_ARGS="${{ matrix.platform.QUICTLS_EXTRA_ARGS }}" scripts/build-ssl.sh
2935
- name: Build contrib tools
3036
run: |
3137
make admin/halog/halog
3238
make dev/flags/flags
3339
make dev/poll/poll
3440
make dev/hpack/decode dev/hpack/gen-enc dev/hpack/gen-rht
35-
- name: Compile HAProxy with ${{ matrix.cc }}
41+
- name: Compile HAProxy with ${{ matrix.platform.cc }}
3642
run: |
37-
make -j3 CC=${{ matrix.cc }} V=1 ERR=1 TARGET=linux-glibc USE_OPENSSL=1 USE_QUIC=1 USE_ZLIB=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_LUA=1 USE_SYSTEMD=1 ADDLIB="-Wl,-rpath,${HOME}/opt/lib" SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include
43+
make -j3 CC=${{ matrix.platform.cc }} V=1 ERR=1 TARGET=linux-glibc USE_OPENSSL=1 USE_QUIC=1 USE_ZLIB=1 USE_PCRE=1 USE_PCRE_JIT=1 USE_LUA=1 USE_SYSTEMD=1 ADDLIB="${{ matrix.platform.ADDLIB_ATOMIC }} -Wl,-rpath,${HOME}/opt/lib" SSL_LIB=${HOME}/opt/lib SSL_INC=${HOME}/opt/include DEBUG_CFLAGS="${{ matrix.platform.DEBUG_CFLAGS }}" LDFLAGS="${{ matrix.platform.LDFLAGS }}"
3844
make install
3945
- name: Show HAProxy version
4046
id: show-version

0 commit comments

Comments
 (0)