diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de89e57..f14b0cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,9 +23,9 @@ variables: &default-variables .haproxy_stable: &haproxy-stable HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.6.git" - HAPROXY_VERSION: 2.6.4 - # https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=2a2078cbac2c2f84e0c25730b61f3ffbe891dd4d - HAPROXY_GITREF: 2a2078cbac2c2f84e0c25730b61f3ffbe891dd4d + HAPROXY_VERSION: 2.6.5 + # https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=987a4e248bbccf4bffe955b27ccfbcbb626348c2 + HAPROXY_GITREF: 987a4e248bbccf4bffe955b27ccfbcbb626348c2 .haproxy_dev: &haproxy-dev HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git" diff --git a/haproxy/Makefile b/haproxy/Makefile index 7043f8e..1eb4932 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.4 -HAPROXY_GITREF = 2a2078cbac2c2f84e0c25730b61f3ffbe891dd4d +HAPROXY_VERSION = 2.6.5 +HAPROXY_GITREF = 987a4e248bbccf4bffe955b27ccfbcbb626348c2 HAPROXY_SHORTSHA = $(shell echo "$(HAPROXY_GITREF)" | grep -Eo '^.{7}' || echo "$(HAPROXY_GITREF)") HAPROXY_VERSION_MINOR = $(shell echo "$(HAPROXY_VERSION)" | cut -d'.' -f1-2)