Fix QuicTLS & HAProxy linking, run regtests in CI

This commit is contained in:
Tristan
2022-06-14 04:46:37 +01:00
parent bee423c7a7
commit 504a45defa
6 changed files with 246 additions and 118 deletions

View File

@@ -21,8 +21,8 @@ $(QUICTLS_BUILDIR): $(QUICTLS_TARBALL)
build: $(QUICTLS_BUILDIR)
cd "$(QUICTLS_BUILDIR)" && sed -i 's/^BUILD_METADATA.*/BUILD_METADATA=$(QUICTLS_BUILD_VERSION)/g' "VERSION.dat"
cd "$(QUICTLS_BUILDIR)" && sed -i 's/^RELEASE_DATE.*/RELEASE_DATE="$(shell date -u +'%e %b %Y')"/g' "VERSION.dat"
cd "$(QUICTLS_BUILDIR)" && ./Configure --prefix="/opt/quictls" --openssldir="/opt/quictls" --libdir="lib" --release -static no-deprecated no-shared
$(MAKE) -C "$(QUICTLS_BUILDIR)" -j "$(shell nproc)" VERSION=$(OPENSSL_VERSION)+quic-mangadex-$(BUILD_VERSION_REPOSHA)
cd "$(QUICTLS_BUILDIR)" && ./Configure --prefix="/opt/quictls" --openssldir="/opt/quictls" --libdir="lib" -DPURIFY no-shared
$(MAKE) -C "$(QUICTLS_BUILDIR)" -j "$(shell nproc)" VERSION=$(OPENSSL_VERSION)+quic-mangadex-$(BUILD_VERSION_REPOSHA) build_sw
ldd "$(QUICTLS_BUILDIR)/apps/openssl" || true
"$(QUICTLS_BUILDIR)/apps/openssl" version

29
deps/vtest/Makefile vendored Normal file
View File

@@ -0,0 +1,29 @@
VTEST_VERSION = master
VTEST_SOURCES = https://codeload.github.com/vtest/vtest/tar.gz/master
VTEST_TARBALL = VTEST-$(VTEST_VERSION).tar.gz
VTEST_BUILDIR = src
VTEST_DESTDIR = dist
all: build $(VTEST_DESTDIR) $(VTEST_DESTDIR)
$(VTEST_TARBALL):
curl -sfS -o "$(VTEST_TARBALL)" "$(VTEST_SOURCES)"
$(VTEST_BUILDIR): $(VTEST_TARBALL)
@if ! [ -d "$(VTEST_BUILDIR)" ]; then mkdir -v "$(VTEST_BUILDIR)"; fi
tar -C $(VTEST_BUILDIR) --strip-components=1 -xf "$(VTEST_TARBALL)"
build: $(VTEST_BUILDIR)
$(MAKE) -C "$(VTEST_BUILDIR)" -j "$(shell nproc)"
$(VTEST_DESTDIR): build
if ! [ -d "$(VTEST_DESTDIR)" ]; then mkdir -v "$(VTEST_DESTDIR)"; fi
cp -fv "$(VTEST_BUILDIR)/vtest" "$(VTEST_DESTDIR)/vtest"
chmod -v +x "$(VTEST_DESTDIR)/vtest"
clean:
rm -fv "$(VTEST_TARBALL)"
rm -rf "$(VTEST_BUILDIR)"
rm -rf "$(VTEST_DESTDIR)"
.PHONY: clean build