diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56deb77..3375e18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,9 @@ variables: &default-variables .haproxy_stable: &haproxy-stable HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.6.git" - HAPROXY_VERSION: 2.6.2 - # https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=16a3646fdff7315802913184a4e12c2a32344aed - HAPROXY_GITREF: 16a3646fdff7315802913184a4e12c2a32344aed + HAPROXY_VERSION: 2.6.3 + # https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=76f187b36b77cc58cca73df2c5b90eec3f32ac12 + HAPROXY_GITREF: 76f187b36b77cc58cca73df2c5b90eec3f32ac12 .haproxy_dev: &haproxy-dev HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git" diff --git a/haproxy/Makefile b/haproxy/Makefile index 3375679..30f5dc8 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -1,6 +1,6 @@ HAPROXY_GITREPO = https://git.haproxy.org/?p=haproxy-2.6.git -HAPROXY_VERSION = 2.6.2 -HAPROXY_GITREF = 16a3646fdff7315802913184a4e12c2a32344aed +HAPROXY_VERSION = 2.6.3 +HAPROXY_GITREF = 76f187b36b77cc58cca73df2c5b90eec3f32ac12 HAPROXY_SHORTSHA = $(shell echo "$(HAPROXY_GITREF)" | grep -Eo '^.{7}' || echo "$(HAPROXY_GITREF)") HAPROXY_VERSION_MINOR = $(shell echo "$(HAPROXY_VERSION)" | cut -d'.' -f1-2) @@ -97,7 +97,6 @@ build_Darwin: # Ignore ssl/ssl_generate_certificate.vtc as it fails and I have no clue why at all test: $(HAPROXY_BUILDIR) - rm -v "$(HAPROXY_BUILDIR)/reg-tests/ssl/ssl_generate_certificate.vtc" || true VTEST_PROGRAM="$(DEP_DIST_ROOT_VTEST)/vtest" \ $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" REGTESTS_TYPES=default,bug,devel reg-tests