Skip to content

Commit

Permalink
Merge branch 'main' into ww/ip-san-localhost
Browse files Browse the repository at this point in the history
  • Loading branch information
woodruffw authored Mar 4, 2024
2 parents 207b1d5 + 6dc86ad commit 995777a
Show file tree
Hide file tree
Showing 17 changed files with 51 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/refresh-bettertls-testcases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
fi
- name: create PR
uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0
uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc # v6.0.1
with:
commit-message: "[BOT] update BetterTLS testcases"
branch: update-BetterTLS-testcases
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/refresh-online-testcases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: make online-cases

- name: create PR
uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0
uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc # v6.0.1
with:
commit-message: "[BOT] update online testcases"
branch: update-online-testcases
Expand Down
69 changes: 30 additions & 39 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ dev: $(NEEDS_VENV)
lint: $(NEEDS_VENV)
. $(VENV_BIN)/activate && \
ruff format --check $(ALL_PY_SRCS) && \
ruff $(ALL_PY_SRCS) && \
ruff check $(ALL_PY_SRCS) && \
mypy $(PY_MODULE)

.PHONY: reformat
reformat: $(NEEDS_VENV)
. $(VENV_BIN)/activate && \
ruff --fix $(ALL_PY_SRCS) && \
ruff check --fix $(ALL_PY_SRCS) && \
ruff format $(ALL_PY_SRCS)

.PHONY: edit
Expand Down
4 changes: 2 additions & 2 deletions harness-support/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ edition = "2021"

[dependencies]
chrono = { version = "0.4.34", features = ["serde"] }
regress = "0.8.0"
regress = "0.9.0"
# TODO: Replace with upstream once merged:
# https://github.com/Marwes/schemafy/pull/76
# schemafy = { git = "https://github.com/woodruffw-forks/schemafy", rev = "de28e87" }
serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.114"
typify = "0.0.15"
typify = "0.0.16"
4 changes: 2 additions & 2 deletions limbo/_assets/online/akamai.com.limbo.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 995777a

Please sign in to comment.