diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87f020a..a42878a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,9 +33,9 @@ variables: &default-variables .haproxy_stable: &haproxy-stable HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.7.git" - HAPROXY_VERSION: 2.7.2 - # https://git.haproxy.org/?p=haproxy-2.7.git;a=commit;h=739996c80a847cd9572d3a4e4e418a7a38ddc2ff - HAPROXY_GITREF: "739996c80a847cd9572d3a4e4e418a7a38ddc2ff" + HAPROXY_VERSION: 2.7-stable + # https://git.haproxy.org/?p=haproxy-2.7.git;a=commit;h=bb4bacf32db7564e668ccc3aacc6bed8688894ba + HAPROXY_GITREF: "bb4bacf32db7564e668ccc3aacc6bed8688894ba" .haproxy_dev: &haproxy-dev HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git" diff --git a/haproxy/Makefile b/haproxy/Makefile index 10a9952..4ed081e 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -1,6 +1,6 @@ HAPROXY_GITREPO = https://git.haproxy.org/?p=haproxy-2.7.git -HAPROXY_VERSION = 2.7.2 -HAPROXY_GITREF = 739996c80a847cd9572d3a4e4e418a7a38ddc2ff +HAPROXY_VERSION = 2.7-stable +HAPROXY_GITREF = bb4bacf32db7564e668ccc3aacc6bed8688894ba HAPROXY_SHORTSHA = $(shell echo "$(HAPROXY_GITREF)" | grep -Eo '^.{7}' || echo "$(HAPROXY_GITREF)") HAPROXY_VERSION_MINOR = $(shell echo "$(HAPROXY_VERSION)" | cut -d'.' -f1-2)