Merge branch 'v1/main' into fix/dns-rebinding-toctou-safeproxyfetch
This commit is contained in:
commit
af79614c81
2 changed files with 16 additions and 3 deletions
8
.github/workflows/e2e_tests.yml
vendored
8
.github/workflows/e2e_tests.yml
vendored
|
|
@ -1,10 +1,14 @@
|
||||||
name: Playwright Tests
|
name: Playwright Tests
|
||||||
|
|
||||||
|
# Pinned to `v1/main`, this branch's own base. These filters read `main`
|
||||||
|
# historically, from when the v1 line was itself `main` — which meant they
|
||||||
|
# matched nothing here and the suite silently never ran on this branch.
|
||||||
|
# See #2065.
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [v1/main]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [main]
|
branches: [v1/main]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
|
|
|
||||||
11
.github/workflows/main.yml
vendored
11
.github/workflows/main.yml
vendored
|
|
@ -1,9 +1,18 @@
|
||||||
|
# `v1/main` is the deprecated maintenance line: it publishes straight from this
|
||||||
|
# branch to the `v1-latest` dist-tag and never merges into `main`, which now
|
||||||
|
# carries v2. Keep these filters pinned to `v1/main` — a stale `main` entry here
|
||||||
|
# describes a topology that no longer exists, and would start matching the moment
|
||||||
|
# anything put a v1-shaped tree back on that branch.
|
||||||
|
#
|
||||||
|
# (For `push`, GitHub runs the workflow file from the pushed commit, so this file
|
||||||
|
# is only ever consulted for `v1/main` regardless. The filter states intent.)
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
|
||||||
- v1/main
|
- v1/main
|
||||||
pull_request:
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- v1/main
|
||||||
release:
|
release:
|
||||||
types: [published]
|
types: [published]
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue