From 50d25158ac615e5e95e5204ae888e1665d121f54 Mon Sep 17 00:00:00 2001 From: Tristan Date: Fri, 22 Jul 2022 18:54:49 +0100 Subject: [PATCH] Update HAProxy stable to 2.6.2 (16a3646f) and 2.7-dev to 2200a9ca --- .gitlab-ci.yml | 9 +++++---- haproxy/Makefile | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2d5fe8..5eb4aaa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,14 +12,15 @@ variables: &default-variables .haproxy_stable: &haproxy-stable HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.6.git" - HAPROXY_VERSION: 2.6.1 - HAPROXY_GITREF: 4b5779ef800cc7982f1b65ff318e4b04fe59cd18 + HAPROXY_VERSION: 2.6.2 + # https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=16a3646fdff7315802913184a4e12c2a32344aed + HAPROXY_GITREF: 16a3646fdff7315802913184a4e12c2a32344aed .haproxy_dev: &haproxy-dev HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git" HAPROXY_VERSION: 2.7-dev - # https://git.haproxy.org/?p=haproxy.git;a=commit;h=2200a9caefdc5fc8ae3a02da8cd48c9ea7e74a63 - HAPROXY_GITREF: 2200a9caefdc5fc8ae3a02da8cd48c9ea7e74a63 + # https://git.haproxy.org/?p=haproxy.git;a=commit;h=53bfac8c632dd77a199194f70062bfd86270d400 + HAPROXY_GITREF: 53bfac8c632dd77a199194f70062bfd86270d400 .build-job: &build-job image: registry.gitlab.com/mangadex-pub/debuilder/buster:main diff --git a/haproxy/Makefile b/haproxy/Makefile index 53f6182..9b4cc64 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.1 -HAPROXY_GITREF = 4b5779ef800cc7982f1b65ff318e4b04fe59cd18 +HAPROXY_VERSION = 2.6.2 +HAPROXY_GITREF = 16a3646fdff7315802913184a4e12c2a32344aed HAPROXY_SHORTSHA = $(shell echo "$(HAPROXY_GITREF)" | grep -Eo '^.{7}' || echo "$(HAPROXY_GITREF)") HAPROXY_VERSION_MINOR = $(shell echo "$(HAPROXY_VERSION)" | cut -d'.' -f1-2)