diff --git a/.github/workflows/build-and-test-make.yml b/.github/workflows/build-and-test-make.yml index 531e2b0d..2e97b55e 100644 --- a/.github/workflows/build-and-test-make.yml +++ b/.github/workflows/build-and-test-make.yml @@ -4,6 +4,8 @@ on: push: branches: - main + - feature/* + - bugfix/* tags: - "v*.*.*" pull_request: diff --git a/.github/workflows/build-win.yaml b/.github/workflows/build-win.yaml index e8f644ca..bc33d450 100644 --- a/.github/workflows/build-win.yaml +++ b/.github/workflows/build-win.yaml @@ -4,6 +4,7 @@ on: branches: - main - feature/* + - bugfix/* tags: - "v*.*.*" pull_request: @@ -51,6 +52,7 @@ jobs: git patch unzip + mingw-w64-${{ matrix.env }}-autotools mingw-w64-${{ matrix.env }}-brotli mingw-w64-${{ matrix.env }}-libidn2 mingw-w64-${{ matrix.env }}-zstd diff --git a/win/build.sh b/win/build.sh index 66e7e53f..f2ee17f5 100644 --- a/win/build.sh +++ b/win/build.sh @@ -61,6 +61,8 @@ sed -i 's/-DUSE_NGHTTP2/-DUSE_NGHTTP2 -DNGHTTP2_STATICLIB/g' src/Makefile.mk sed -i 's/-lidn2/-lidn2 -lunistring -liconv/g' lib/Makefile.mk sed -i 's/-lidn2/-lidn2 -lunistring -liconv/g' src/Makefile.mk +autoreconf -fi + mingw32-make -f Makefile.dist mingw32-clean mingw32-make -f Makefile.dist mingw32 -j CFLAGS="-DUSE_HTTP2=1 -DUSE_WEBSOCKETS=1 -DUSE_ECH=1 -Wno-unused-variable" CFG=-ssl-zlib-nghttp2-idn2-brotli-zstd-ipv6