Skip to content

Commit 0ea9d72

Browse files
nginx-mainline, nginx-stable: add brotli dynamic module
Add ngx_brotli as two dynamic module subpackages (nginx-{mainline,stable}-mod-http_brotli_filter and -static), pinned to google/ngx_brotli master at a71f9312. brotli-dev was already present in the build environment (residue from prior attempt #8771) and now has a consumer. The ngx_brotli config script picks up system libbrotli via pkg-config, so no submodule initialization is required. Refs: #8771 (stale-closed prior attempt)
1 parent e06e763 commit 0ea9d72

2 files changed

Lines changed: 22 additions & 2 deletions

File tree

nginx-mainline.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ var-transforms:
5858
data:
5959
- name: modules
6060
items:
61+
http_brotli_filter: "10"
62+
http_brotli_static: "10"
6163
http_geoip: "10"
6264
http_image_filter: "10"
6365
http_perl: "10"
@@ -87,6 +89,13 @@ pipeline:
8789
expected-commit: 5eaf45f11e85459b52c18f876e69320df420ae29
8890
destination: nginx-mainline
8991

92+
- uses: git-checkout
93+
with:
94+
repository: https://github.com/google/ngx_brotli.git
95+
branch: master
96+
expected-commit: a71f9312c2deb28875acc7bacfdd5695a111aa53
97+
destination: ngx_brotli
98+
9099
- name: configure
91100
working-directory: nginx-mainline
92101
runs: |
@@ -139,7 +148,8 @@ pipeline:
139148
--with-stream_ssl_module \
140149
--with-stream_realip_module \
141150
--with-stream_geoip_module=dynamic \
142-
--with-stream_ssl_preread_module
151+
--with-stream_ssl_preread_module \
152+
--add-dynamic-module=../ngx_brotli
143153
144154
- working-directory: nginx-mainline
145155
runs: |

nginx-stable.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ var-transforms:
5454
data:
5555
- name: modules
5656
items:
57+
http_brotli_filter: "10"
58+
http_brotli_static: "10"
5759
http_geoip: "10"
5860
http_image_filter: "10"
5961
http_perl: "10"
@@ -84,6 +86,13 @@ pipeline:
8486
expected-commit: 9b958b000776c88036cd800c66e7e4ad39e6fd41
8587
destination: nginx-stable
8688

89+
- uses: git-checkout
90+
with:
91+
repository: https://github.com/google/ngx_brotli.git
92+
branch: master
93+
expected-commit: a71f9312c2deb28875acc7bacfdd5695a111aa53
94+
destination: ngx_brotli
95+
8796
- name: configure
8897
working-directory: nginx-stable
8998
runs: |
@@ -138,7 +147,8 @@ pipeline:
138147
--with-stream_ssl_module \
139148
--with-stream_realip_module \
140149
--with-stream_geoip_module=dynamic \
141-
--with-stream_ssl_preread_module
150+
--with-stream_ssl_preread_module \
151+
--add-dynamic-module=../ngx_brotli
142152
143153
- working-directory: nginx-stable
144154
runs: |

0 commit comments

Comments
 (0)