emo/haproxy
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'haproxy-2.6.3' into 'main'

Browse Source 
Upgrade HAProxy stable to 2.6.3

See merge request mangadex-pub/haproxy!11
This commit is contained in:
Tristan 2022-08-19 22:33:11 +00:00
commit 8501d6df90
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -12,9 +12,9 @@ variables: &default-variables
.haproxy_stable: &haproxy-stable .haproxy_stable: &haproxy-stable
HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.6.git" HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.6.git"
HAPROXY_VERSION: 2.6.2 HAPROXY_VERSION: 2.6.3
# https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=16a3646fdff7315802913184a4e12c2a32344aed # https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=76f187b36b77cc58cca73df2c5b90eec3f32ac12
HAPROXY_GITREF: 16a3646fdff7315802913184a4e12c2a32344aed HAPROXY_GITREF: 76f187b36b77cc58cca73df2c5b90eec3f32ac12
.haproxy_dev: &haproxy-dev .haproxy_dev: &haproxy-dev
HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git" HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git"

5
haproxy/Makefile
View File

@ -1,6 +1,6 @@
HAPROXY_GITREPO = https://git.haproxy.org/?p=haproxy-2.6.git HAPROXY_GITREPO = https://git.haproxy.org/?p=haproxy-2.6.git
HAPROXY_VERSION = 2.6.2 HAPROXY_VERSION = 2.6.3
HAPROXY_GITREF = 16a3646fdff7315802913184a4e12c2a32344aed HAPROXY_GITREF = 76f187b36b77cc58cca73df2c5b90eec3f32ac12
HAPROXY_SHORTSHA = $(shell echo "$(HAPROXY_GITREF)" | grep -Eo '^.{7}' || echo "$(HAPROXY_GITREF)") HAPROXY_SHORTSHA = $(shell echo "$(HAPROXY_GITREF)" | grep -Eo '^.{7}' || echo "$(HAPROXY_GITREF)")
HAPROXY_VERSION_MINOR = $(shell echo "$(HAPROXY_VERSION)" | cut -d'.' -f1-2) 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 # Ignore ssl/ssl_generate_certificate.vtc as it fails and I have no clue why at all
test: $(HAPROXY_BUILDIR) test: $(HAPROXY_BUILDIR)
rm -v "$(HAPROXY_BUILDIR)/reg-tests/ssl/ssl_generate_certificate.vtc" || true
VTEST_PROGRAM="$(DEP_DIST_ROOT_VTEST)/vtest" \ VTEST_PROGRAM="$(DEP_DIST_ROOT_VTEST)/vtest" \
$(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" REGTESTS_TYPES=default,bug,devel reg-tests $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" REGTESTS_TYPES=default,bug,devel reg-tests