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

Update HAProxy stable to 2.6.2 (16a3646f) and 2.7-dev to 2200a9ca

Browse Source
This commit is contained in:
Tristan 2022-07-22 18:54:49 +01:00
parent 60a2d48baf
commit 50d25158ac
No known key found for this signature in database
GPG Key ID: BDDFC4A0651ACDE4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -12,14 +12,15 @@ 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.1 HAPROXY_VERSION: 2.6.2
HAPROXY_GITREF: 4b5779ef800cc7982f1b65ff318e4b04fe59cd18 # https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=16a3646fdff7315802913184a4e12c2a32344aed
HAPROXY_GITREF: 16a3646fdff7315802913184a4e12c2a32344aed
.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"
HAPROXY_VERSION: 2.7-dev HAPROXY_VERSION: 2.7-dev
# https://git.haproxy.org/?p=haproxy.git;a=commit;h=2200a9caefdc5fc8ae3a02da8cd48c9ea7e74a63 # https://git.haproxy.org/?p=haproxy.git;a=commit;h=53bfac8c632dd77a199194f70062bfd86270d400
HAPROXY_GITREF: 2200a9caefdc5fc8ae3a02da8cd48c9ea7e74a63 HAPROXY_GITREF: 53bfac8c632dd77a199194f70062bfd86270d400
.build-job: &build-job .build-job: &build-job
image: registry.gitlab.com/mangadex-pub/debuilder/buster:main image: registry.gitlab.com/mangadex-pub/debuilder/buster:main

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.1 HAPROXY_VERSION = 2.6.2
HAPROXY_GITREF = 4b5779ef800cc7982f1b65ff318e4b04fe59cd18 HAPROXY_GITREF = 16a3646fdff7315802913184a4e12c2a32344aed
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)