Skip to content

Commit a8d3d51

Browse files
committed
switch to gixy-ng
Skip the added if_is_evil check since it's overly aggressive and doesn't permit if blocks with `rewrite ... permanent` despite it being safe.
1 parent b40d2cc commit a8d3d51

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

.github/workflows/static.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
cache: npm
1414
- uses: actions/setup-python@v5
1515
with:
16-
python-version: '3.12'
16+
python-version: '3.13'
1717
cache: pip
1818

1919
- run: sudo apt-get update

process-static

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ done
5757

5858
sed -i "$replace" static-tmp/**/*.html nginx-tmp/nginx.conf nginx-tmp/snippets/preload.conf
5959

60-
gixy nginx-tmp/nginx.conf
60+
gixy --skips if_is_evil nginx-tmp/nginx.conf
6161

6262
xmllint --noout static-tmp/**/*.@(html|svg|xml)
6363
java -jar node_modules/vnu-jar/build/dist/vnu.jar --errors-only static-tmp/**/*.html

requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
gixy
1+
gixy-ng

requirements.txt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,18 @@
44
#
55
# pip-compile --generate-hashes
66
#
7-
cached-property==2.0.1 \
8-
--hash=sha256:484d617105e3ee0e4f1f58725e72a8ef9e93deee462222dbd51cd91230897641 \
9-
--hash=sha256:f617d70ab1100b7bcf6e42228f9ddcb78c676ffa167278d9f730d1c2fba69ccb
10-
# via gixy
117
configargparse==1.7.1 \
128
--hash=sha256:79c2ddae836a1e5914b71d58e4b9adbd9f7779d4e6351a637b7d2d9b6c46d3d9 \
139
--hash=sha256:8b586a31f9d873abd1ca527ffbe58863c99f36d896e2829779803125e83be4b6
14-
# via gixy
15-
gixy==0.1.21 \
16-
--hash=sha256:55be805e0582ac95540f49ea7f80b2de0b5304cb63edd22e1e6520d18f3c184b \
17-
--hash=sha256:e39c87401c73d33cd8965324caa3e1778ef22ed7ade179b459a3493bdfe0f88a
10+
# via gixy-ng
11+
gixy-ng==0.2.7 \
12+
--hash=sha256:0b5f95b1d1b6a665cbcc5d4d62847b77cc0d132153831e7bb7dc60101af18537 \
13+
--hash=sha256:e7920f893a8e1e129881aee6fd2eebaa4185694753f6d438e1cc59da597cfc32
1814
# via -r requirements.in
1915
jinja2==3.1.6 \
2016
--hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \
2117
--hash=sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
22-
# via gixy
18+
# via gixy-ng
2319
markupsafe==3.0.2 \
2420
--hash=sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4 \
2521
--hash=sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30 \
@@ -86,8 +82,8 @@ markupsafe==3.0.2 \
8682
pyparsing==2.4.7 \
8783
--hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \
8884
--hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b
89-
# via gixy
85+
# via gixy-ng
9086
six==1.17.0 \
9187
--hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \
9288
--hash=sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81
93-
# via gixy
89+
# via gixy-ng

setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
npm ci --ignore-scripts
44

5-
python3.12 -m venv --clear venv
5+
python3 -m venv --clear venv
66
source venv/bin/activate
77
pip install --require-hashes --only-binary :all: -r requirements.txt

0 commit comments

Comments
 (0)