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.

Sign up for GitHub

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

Hide closed prs #3

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Hide closed prs #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f177d71
Pin prometheus-app=1.1 in current-bench.opam
art-w Jun 17, 2022
9f7db5a
Pin prometheus-app=1.1 in cb-worker.opam and cluster/Dockerfile
punchagan Jun 20, 2022
222be16
TMP: Temp commit for testing
punchagan Jun 21, 2022
1db799e
TMP: Another test commit
punchagan Jun 21, 2022
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
2 changes: 1 addition & 1 deletion cluster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ocaml/opam:debian-ocaml-4.13 AS build
RUN sudo apt-get update && sudo apt-get install libc6-dev libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev libffi-dev -y --no-install-recommends
RUN opam remote add origin 'https://opam.ocaml.org' --all-switches && opam remote remove default && opam update
RUN opam install dune>=2.8 ppx_expect>=v0.14.1 prometheus ppx_sexp_conv dune-build-info lwt>=5.4.1 capnp-rpc-lwt>=1.2 capnp-rpc-net capnp-rpc-unix>=1.2 extunix>=0.3.2 logs conf-libev digestif>=0.8 fpath lwt-dllist prometheus-app>=1.1 cohttp-lwt-unix sqlite3 psq mirage-crypto>=0.8.5 ppx_deriving ppx_deriving_yojson astring fmt>=0.8.9 cmdliner tar-unix>=2.0.0 yojson sexplib sha
RUN opam install dune>=2.8 ppx_expect>=v0.14.1 prometheus ppx_sexp_conv dune-build-info lwt>=5.4.1 capnp-rpc-lwt>=1.2 capnp-rpc-net capnp-rpc-unix>=1.2 extunix>=0.3.2 logs conf-libev digestif>=0.8 fpath lwt-dllist prometheus-app=1.1 cohttp-lwt-unix sqlite3 psq mirage-crypto>=0.8.5 ppx_deriving ppx_deriving_yojson astring fmt>=0.8.9 cmdliner tar-unix>=2.0.0 yojson sexplib sha
RUN mkdir src && cd src && git clone 'https://github.com/ocurrent/ocluster' && opam pin -yn ocluster
RUN cd src && git clone 'https://github.com/ocurrent/obuilder' && opam pin -yn obuilder
WORKDIR src/ocluster
Expand Down
1 change: 1 addition & 0 deletions current-bench.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ depends: [
"fpath"
"logs"
"postgresql"
"prometheus-app" {= "1.1"}
"rresult"
"omigrate"
"timere"
Expand Down
14 changes: 5 additions & 9 deletions local-test-repo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ define BENCH_DATA_B1_T1_A
"metrics": [
{
"name": "grammarFunctor/parsing",
"value": 0.19,
"value": 0.3,
"units": "secs",
"trend": "lower-is-better"
},
{
"name": "grammarFunctor/typing",
"value": 0.28,
"value": 0.3,
"units": "secs",
"trend": "lower-is-better"
},
{
"name": "grammarFunctor/generate",
"value": 0.14,
"value": 0.1,
"units": "secs",
"trend": "lower-is-better"
}
Expand All @@ -40,14 +40,14 @@ define BENCH_DATA_B1_T1_B
"metrics": [
{
"name": "ops_per_sec",
"value": 690.0,
"value": 650.0,
"units": "num/sec",
"description": "The number of awesome things done in a second",
"trend": "higher-is-better"
},
{
"name": "mbs_per_sec",
"value": 199,
"value": 189,
"units": "mbps",
"description": "Quantity of awesome data downloaded"
}
Expand Down Expand Up @@ -90,7 +90,3 @@ bench:
@echo "$$BENCH_DATA_B1_T1_B" | jq -M .
echo "Log message 4"
echo "Log message 5"
@echo "$$BENCH_DATA_B1_T2" | jq -M .
echo "Log message 6"
echo "Log message 7"
@echo "$$BENCH_DATA_3"
2 changes: 1 addition & 1 deletion worker/cb-worker.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ depends: [
"ocluster-api" {= "dev"}
"obuilder" {= "dev"}
"obuilder-spec" {= "dev"}
"prometheus-app"
"prometheus-app" {= "1.1"}
"fpath"
"logs"
"ocaml" {>= "4.08"}
Expand Down