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

Merge branch 'haproxy-2.6.1' into 'main'

Browse Source 
Upgrade stable to v2.6.1 and dev to 2.7 current master

See merge request mangadex-pub/haproxy!5
This commit is contained in:
Tristan 2022-06-22 15:00:47 +00:00
commit 10d88f2d51
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitlab-ci.yml
View File

@ -9,13 +9,15 @@ variables: &default-variables
GIT_DEPTH: "1" GIT_DEPTH: "1"
.haproxy_stable: &haproxy-stable .haproxy_stable: &haproxy-stable
HAPROXY_VERSION: 2.6.0 HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.6.git"
HAPROXY_GITREF: v2.6.0 HAPROXY_VERSION: 2.6.1
HAPROXY_GITREF: 4b5779ef800cc7982f1b65ff318e4b04fe59cd18
.haproxy_dev: &haproxy-dev .haproxy_dev: &haproxy-dev
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=040955fb39f8df183adda6fa19761a1ede36f624 # https://git.haproxy.org/?p=haproxy.git;a=commit;h=1bad7db4a146e91cc2e9db72a92935ce9df5d24a
HAPROXY_GITREF: 040955fb39f8df183adda6fa19761a1ede36f624 HAPROXY_GITREF: 1bad7db4a146e91cc2e9db72a92935ce9df5d24a
.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
@ -80,7 +82,7 @@ vtest:
- mkdir deps/lua/dist && tar -C deps/lua/dist -xf deps/lua/lua-dist.tar.gz - mkdir deps/lua/dist && tar -C deps/lua/dist -xf deps/lua/lua-dist.tar.gz
- mkdir deps/pcre2/dist && tar -C deps/pcre2/dist -xf deps/pcre2/pcre2-dist.tar.gz - mkdir deps/pcre2/dist && tar -C deps/pcre2/dist -xf deps/pcre2/pcre2-dist.tar.gz
- mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz - mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz
- make -C haproxy HAPROXY_VERSION=$HAPROXY_VERSION HAPROXY_GITREF=$HAPROXY_GITREF - make -C haproxy HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF"
needs: *needs-dependencies needs: *needs-dependencies
artifacts: artifacts:
expire_in: 7 days expire_in: 7 days
@ -94,7 +96,7 @@ vtest:
- mkdir deps/lua/dist && tar -C deps/lua/dist -xf deps/lua/lua-dist.tar.gz - mkdir deps/lua/dist && tar -C deps/lua/dist -xf deps/lua/lua-dist.tar.gz
- mkdir deps/pcre2/dist && tar -C deps/pcre2/dist -xf deps/pcre2/pcre2-dist.tar.gz - mkdir deps/pcre2/dist && tar -C deps/pcre2/dist -xf deps/pcre2/pcre2-dist.tar.gz
- mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz - mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz
- make -C haproxy HAPROXY_VERSION=$HAPROXY_VERSION HAPROXY_GITREF=$HAPROXY_GITREF build test - make -C haproxy HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF" build test
needs: needs:
- *needs-dependencies - *needs-dependencies
- job: vtest - job: vtest
@ -109,7 +111,7 @@ vtest:
- mkdir deps/pcre2/dist && tar -C deps/pcre2/dist -xf deps/pcre2/pcre2-dist.tar.gz - mkdir deps/pcre2/dist && tar -C deps/pcre2/dist -xf deps/pcre2/pcre2-dist.tar.gz
- mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz - mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz
- export BUILD_MESSAGE="$CI_COMMIT_MESSAGE" - export BUILD_MESSAGE="$CI_COMMIT_MESSAGE"
- make -C haproxy dist-deb HAPROXY_VERSION=$HAPROXY_VERSION HAPROXY_GITREF=$HAPROXY_GITREF - make -C haproxy dist-deb HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF"
- | - |
set -euo pipefail set -euo pipefail

7
haproxy/Makefile
View File

@ -1,9 +1,10 @@
HAPROXY_VERSION = 2.6.0 HAPROXY_GITREPO = https://git.haproxy.org/?p=haproxy-2.6.git
HAPROXY_GITREF = a1efc048bf8a5e14466dbe7317e73117e8d66176 HAPROXY_VERSION = 2.6.1
HAPROXY_GITREF = 4b5779ef800cc7982f1b65ff318e4b04fe59cd18
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)
HAPROXY_SOURCES = https://git.haproxy.org/?p=haproxy.git;a=snapshot;h=$(HAPROXY_GITREF);sf=tgz HAPROXY_SOURCES = $(HAPROXY_GITREPO);a=snapshot;h=$(HAPROXY_GITREF);sf=tgz
HAPROXY_TARBALL = haproxy-$(HAPROXY_VERSION)-$(HAPROXY_SHORTSHA).tar.gz HAPROXY_TARBALL = haproxy-$(HAPROXY_VERSION)-$(HAPROXY_SHORTSHA).tar.gz
HAPROXY_DEBORIG = haproxy_$(HAPROXY_VERSION)-$(HAPROXY_SHORTSHA).orig.tar.gz HAPROXY_DEBORIG = haproxy_$(HAPROXY_VERSION)-$(HAPROXY_SHORTSHA).orig.tar.gz
HAPROXY_BUILDIR = src HAPROXY_BUILDIR = src