Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update hpack library #56

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2

common_cache_key: &common_cache_key
key: dependency-cache-{{ checksum "../ocaml-version" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "hpack.opam" }}-{{ checksum "h2.opam" }}-{{ checksum "h2-lwt.opam" }}-{{ checksum "h2-lwt-unix.opam" }}-{{ checksum "h2-mirage.opam" }}
key: dependency-cache-{{ checksum "../ocaml-version" }}-{{ checksum ".circleci/config.yml" }}-{{ checksum "h2.opam" }}-{{ checksum "h2-lwt.opam" }}-{{ checksum "h2-lwt-unix.opam" }}-{{ checksum "h2-mirage.opam" }}

esy_cache_key: &esy_cache_key
key: esy-cache-{{ checksum "esy.json" }}-{{ checksum "../esy-checksum" }}-{{ checksum ".circleci/config.yml" }}
Expand Down Expand Up @@ -37,6 +37,7 @@ opam-steps: &opam-steps
opam pin add -y httpaf --dev-repo
opam pin add -y httpaf-lwt-unix git+https://github.com/anmonteiro/httpaf#anmonteiro/lwt-https-support
opam pin add -y ssl git+https://github.com/anmonteiro/ocaml-ssl#alpn
opam pin add -y hpack git+https://github.com/314eter/ocaml-hpack#8077a85
opam install -y lwt_ssl
opam install -t --deps-only .
- run:
Expand All @@ -52,11 +53,6 @@ opam-steps: &opam-steps
eval `opam config env`
dune build @all
dune runtest --no-buffer
- run:
name: 'Slow Tests'
command: |
eval `opam config env`
dune build @slowtests --no-buffer
- run:
name: 'Conformance tests'
command: |
Expand Down Expand Up @@ -159,9 +155,6 @@ jobs:
- run:
name: 'esy test'
command: ~/.npm-global/bin/esy b dune runtest --no-buffer
- run:
name: 'esy slow-test'
command: ~/.npm-global/bin/esy b dune build @slowtests --no-buffer
- run:
name: 'Check code is formatted with ocamlformat'
command: |
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "hpack/test/hpack-test-case"]
path = hpack/test/hpack-test-case
url = [email protected]:http2jp/hpack-test-case.git
[submodule "lib_test/http2-frame-test-case"]
path = lib_test/http2-frame-test-case
url = [email protected]:http2jp/http2-frame-test-case.git
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ all: build
test:
esy b dune runtest --no-buffer

slow-test:
esy b dune build @slowtests --no-buffer

install:
esy b dune install

Expand Down
4 changes: 3 additions & 1 deletion esy.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"@opam/bigstringaf": "*",
"@opam/angstrom": "*",
"@opam/faraday": "*",
"@opam/hpack": "*",
"@opam/psq": "*",
"@opam/mirage-conduit": "*",
"@opam/faraday-lwt-unix": "*",
Expand Down Expand Up @@ -89,6 +90,7 @@
},
"@opam/tls": "dune-universe/ocaml-tls:tls.opam#9761033",
"@opam/tls-lwt": "dune-universe/ocaml-tls:tls-lwt.opam#9761033",
"@opam/tls-mirage": "dune-universe/ocaml-tls:tls-mirage.opam#9761033"
"@opam/tls-mirage": "dune-universe/ocaml-tls:tls-mirage.opam#9761033",
"@opam/hpack": "314eter/ocaml-hpack:hpack.opam#9be540d"
}
}
24 changes: 23 additions & 1 deletion esy.lock/index.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "7677c103d74a45a530a6bc4e593bb0e5",
"checksum": "04c99fb49954ba2fae6bdfb8c449927a",
"root": "h2@link-dev:./esy.json",
"node": {
"yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#cca65f99674ed2d954d28788edeb8c57fada5ed0@d41d8cd9": {
Expand Down Expand Up @@ -47,6 +47,7 @@
"@opam/lwt_ssl@opam:1.1.2@ac833920", "@opam/lwt@opam:4.2.1@c1888ec9",
"@opam/httpaf-lwt-unix@github:anmonteiro/httpaf:httpaf-lwt-unix.opam#6d2c80e@33b6fb1d",
"@opam/httpaf@github:inhabitedtype/httpaf:httpaf.opam#fa9dc4e@d41d8cd9",
"@opam/hpack@github:314eter/ocaml-hpack:hpack.opam#9be540d@d41d8cd9",
"@opam/faraday-lwt-unix@opam:0.7.0@b0dea04f",
"@opam/faraday@opam:0.7.0@6026a81f",
"@opam/dune@opam:1.10.0@b15ce221",
Expand Down Expand Up @@ -2414,6 +2415,27 @@
"@opam/angstrom@opam:0.11.2@2e02b026"
]
},
"@opam/hpack@github:314eter/ocaml-hpack:hpack.opam#9be540d@d41d8cd9": {
"id":
"@opam/hpack@github:314eter/ocaml-hpack:hpack.opam#9be540d@d41d8cd9",
"name": "@opam/hpack",
"version": "github:314eter/ocaml-hpack:hpack.opam#9be540d",
"source": {
"type": "install",
"source": [ "github:314eter/ocaml-hpack:hpack.opam#9be540d" ]
},
"overrides": [],
"dependencies": [
"[email protected]@d41d8cd9", "@opam/faraday@opam:0.7.0@6026a81f",
"@opam/dune@opam:1.10.0@b15ce221",
"@opam/angstrom@opam:0.11.2@2e02b026",
"@esy-ocaml/[email protected]@d41d8cd9"
],
"devDependencies": [
"[email protected]@d41d8cd9", "@opam/faraday@opam:0.7.0@6026a81f",
"@opam/angstrom@opam:0.11.2@2e02b026"
]
},
"@opam/hex@opam:1.4.0@70cc7ec2": {
"id": "@opam/hex@opam:1.4.0@70cc7ec2",
"name": "@opam/hex",
Expand Down
27 changes: 0 additions & 27 deletions hpack.opam

This file was deleted.

22 changes: 0 additions & 22 deletions hpack/original.LICENSE

This file was deleted.

230 changes: 0 additions & 230 deletions hpack/src/decoder.ml

This file was deleted.

Loading