Skip to content

Commit b1664a7

Browse files
authored
Merge pull request #8 from xshill/master
Sync master with upstream
2 parents bda9c4e + 50ba950 commit b1664a7

927 files changed

Lines changed: 45670 additions & 38409 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Bug Report
2+
description: File a bug report to help us improve.
3+
labels: ["kind/triage"]
4+
body:
5+
- type: textarea
6+
attributes:
7+
label: Problem Description
8+
value: |
9+
A clear and concise description of what the bug is.
10+
11+
#### Steps to reproduce the behavior:
12+
1.
13+
2.
14+
3.
15+
validations:
16+
required: true
17+
- type: textarea
18+
attributes:
19+
label: System Information
20+
description: Paste the output of "mitmproxy --version" here.
21+
render: raw
22+
- type: checkboxes
23+
attributes:
24+
label: 'Checklist'
25+
options:
26+
- label: This bug affects the [latest mitmproxy release](https://github.com/mitmproxy/mitmproxy/releases).
27+
required: true

.github/dependabot.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,26 @@ updates:
1313
schedule:
1414
interval: "monthly"
1515
open-pull-requests-limit: 10
16+
groups:
17+
pytest:
18+
patterns:
19+
- "pytest*"
20+
- "hypothesis"
21+
pyinstaller:
22+
patterns:
23+
- "pyinstaller*"
24+
mypy:
25+
patterns:
26+
- "types-*"
27+
- "mypy"
28+
openssl:
29+
patterns:
30+
- "pyopenssl"
31+
- "cryptography"
32+
tox:
33+
patterns:
34+
- "tox*"
35+
deploy:
36+
patterns:
37+
- "awscli"
38+
- "twine"

.github/node-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14
1+
24

.github/python-version.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/autofix.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,31 @@ jobs:
1313
autofix:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: mhils/workflows/checkout@8fe88b311a66c441e01edfebe4cd90d8a47fa335
17+
- uses: mhils/workflows/setup-uv@8fe88b311a66c441e01edfebe4cd90d8a47fa335
1718

18-
- uses: install-pinned/ruff@0e35bc58bd73769469284df9e1f8898daeea8768
19-
- run: ruff --fix-only .
19+
# If we need to update the lockfile (--check returns an error),
20+
# make sure to upgrade everything.
21+
- run: uv lock --check || uv lock --upgrade
22+
23+
- uses: mhils/workflows/uv-sync@8fe88b311a66c441e01edfebe4cd90d8a47fa335
24+
25+
- run: ruff check --fix-only .
2026
- run: ruff format .
2127

22-
- name: Run prettier
23-
run: |
24-
npm ci
25-
npm run prettier
28+
- run: web/gen/all
29+
30+
- uses: actions/setup-node@v6
31+
with:
32+
node-version-file: .github/node-version.txt
33+
- run: npm ci
34+
working-directory: web
35+
- run: npm run eslint
36+
working-directory: web
37+
continue-on-error: true
38+
- run: npm run prettier
2639
working-directory: web
2740

2841
- uses: mhils/add-pr-ref-in-changelog@main
2942

30-
- uses: autofix-ci/action@d3e591514b99d0fca6779455ff8338516663f7cc
43+
- uses: autofix-ci/action@635ffb0c9798bd160680f18fd73371e355b85f27

0 commit comments

Comments
 (0)