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

Support per-flavour patchsets

Browse Source
This commit is contained in:
Tristan 2023-03-23 09:24:58 +00:00
parent 8fea6b3b41
commit 58735255ff
No known key found for this signature in database
GPG Key ID: BDDFC4A0651ACDE4
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -36,12 +36,14 @@ variables: &default-variables
HAPROXY_VERSION: 2.7-stable HAPROXY_VERSION: 2.7-stable
# https://git.haproxy.org/?p=haproxy-2.7.git;a=commit;h=8d230219e15295a3c4757f94916aafcf540a7337 # https://git.haproxy.org/?p=haproxy-2.7.git;a=commit;h=8d230219e15295a3c4757f94916aafcf540a7337
HAPROXY_GITREF: "8d230219e15295a3c4757f94916aafcf540a7337" HAPROXY_GITREF: "8d230219e15295a3c4757f94916aafcf540a7337"
BUILD_PATCHES_DIR: "patches-stable"
.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.8-dev HAPROXY_VERSION: 2.8-dev
# https://git.haproxy.org/?p=haproxy.git;a=commit;h=1751db140ab609e38af8218efbd23427115a42aa # https://git.haproxy.org/?p=haproxy.git;a=commit;h=1751db140ab609e38af8218efbd23427115a42aa
HAPROXY_GITREF: "1751db140ab609e38af8218efbd23427115a42aa" HAPROXY_GITREF: "1751db140ab609e38af8218efbd23427115a42aa"
BUILD_PATCHES_DIR: "patches-dev"
.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
@ -119,7 +121,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_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF" - make -C haproxy HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF" BUILD_PATCHES_DIR="$BUILD_PATCHES_DIR"
needs: *needs-dependencies needs: *needs-dependencies
artifacts: artifacts:
expire_in: 7 days expire_in: 7 days
@ -133,7 +135,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_GITREPO="$HAPROXY_GITREPO" 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_PATCHES_DIR="$BUILD_PATCHES_DIR" build test
needs: needs:
- *needs-dependencies - *needs-dependencies
- job: vtest - job: vtest
@ -148,7 +150,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_GITREPO="$HAPROXY_GITREPO" 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" BUILD_PATCHES_DIR="$BUILD_PATCHES_DIR"
- | - |
set -euo pipefail set -euo pipefail

2
haproxy/Makefile
View File

@ -19,7 +19,7 @@ DEP_DIST_ROOT_VTEST = $(shell realpath ../deps/vtest/dist)
BUILD_VERSION_REPOSHA = $(shell git rev-parse --short HEAD) BUILD_VERSION_REPOSHA = $(shell git rev-parse --short HEAD)
BUILD_PATCHES_DIR = $(shell realpath patches) BUILD_PATCHES_DIR = $(shell realpath patches-stable)
BUILD_PATCHES_FILES = $(shell ls -1 $(BUILD_PATCHES_DIR)) BUILD_PATCHES_FILES = $(shell ls -1 $(BUILD_PATCHES_DIR))
DEBIAN_PATCHES_DIR = "$(HAPROXY_BUILDIR)/debian/patches" DEBIAN_PATCHES_DIR = "$(HAPROXY_BUILDIR)/debian/patches"

0
haproxy/patches/.gitkeep → haproxy/patches-dev/.gitkeep
View File

0
haproxy/patches-stable/.gitkeep Normal file
View File