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

Merge branch 'haproxy-2.6.4' into 'main'

Browse Source 
Update HAProxy stable to 2.6.4

See merge request mangadex-pub/haproxy!12
This commit is contained in:
Tristan 2022-08-22 21:24:08 +00:00
commit b5b8044df8
2 changed files with 5 additions and 5 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.3 HAPROXY_VERSION: 2.6.4
# https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=76f187b36b77cc58cca73df2c5b90eec3f32ac12 # https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=2a2078cbac2c2f84e0c25730b61f3ffbe891dd4d
HAPROXY_GITREF: 76f187b36b77cc58cca73df2c5b90eec3f32ac12 HAPROXY_GITREF: 2a2078cbac2c2f84e0c25730b61f3ffbe891dd4d
.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"

4
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.3 HAPROXY_VERSION = 2.6.4
HAPROXY_GITREF = 76f187b36b77cc58cca73df2c5b90eec3f32ac12 HAPROXY_GITREF = 2a2078cbac2c2f84e0c25730b61f3ffbe891dd4d
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)