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

refactor: use rely for tests and piaf for fetch-native-lwt #25

Merged
merged 43 commits into from
Feb 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
641a92e
chore: see if choco is available
lessp Oct 19, 2019
3db12fa
chore: invalid workflow
lessp Oct 19, 2019
77f58f7
chore: maybe os needs a string
lessp Oct 19, 2019
a584f52
chore: what does pkg-config openssl yield
lessp Oct 19, 2019
753c7b4
chore: only run windows-build
lessp Oct 19, 2019
9cc218b
chore: ...
lessp Oct 19, 2019
333e1ac
chore(native-lwt): try pinning conf-openssl
lessp Nov 2, 2019
65261fd
chore: merge master locally
lessp Nov 2, 2019
1ffbe44
chore: integrate master changes
lessp Nov 2, 2019
be1526e
chore: try whole build, windows
lessp Nov 2, 2019
38de112
chore: os expects a list
lessp Nov 2, 2019
b6eecc2
chore: merge master
lessp Nov 15, 2019
bde5617
chore: use different esy-openssl pin
lessp Nov 15, 2019
f711b5a
chore(ci): only run workflow for windows
lessp Nov 15, 2019
023a0ec
chore: use opam conf-libssl
lessp Nov 15, 2019
6f6d838
chore: skip pkg-config
lessp Nov 15, 2019
d51a19a
refactor: try cohttp with ssl pinned
lessp Nov 15, 2019
7f22993
chore: try installing pkc-config again
lessp Nov 15, 2019
bc3b6f9
chore: merge master locally
lessp Dec 17, 2019
e2f2cdb
refactor: use piaf and use rely for tests
lessp Jan 2, 2020
bd665e1
chore: remove pkg-config from CI
lessp Jan 2, 2020
1fc470b
chore: lockfiles
lessp Jan 2, 2020
55b3865
refactor(native-lwt): Use Piaf as backing implementation
lessp Feb 21, 2020
dbd2790
chore: merge with local piaf-refactor
lessp Feb 21, 2020
416cdea
chore: pin to ocaml < 4.9
lessp Feb 21, 2020
61874bc
refactor: add piaf config
lessp Feb 21, 2020
cd57a42
chore: use esy nightly
lessp Feb 21, 2020
b967311
chore: typo for esy-nightly
lessp Feb 21, 2020
dded488
chore: back with pkgconfig
lessp Feb 21, 2020
187ce87
chore: maybe we need yarn-pkg-config
lessp Feb 21, 2020
5802b2e
chore: remove manual pkg-config
lessp Feb 21, 2020
25f963f
chore: looks like we forgot esy
lessp Feb 21, 2020
49e9500
chore(ci): build fetch-core and native-lwt separate
lessp Feb 21, 2020
fb8f188
chore: add yarn-pkg to native-lwt
lessp Feb 21, 2020
e8f4408
chore: ocaml 4.9.0
lessp Feb 22, 2020
26c38f1
chore: use lts node
lessp Feb 22, 2020
7eed5c9
chore(ci): simplify pr workflow
lessp Feb 22, 2020
f5136a9
chore: pin esy-openssl correctly
lessp Feb 22, 2020
135fc66
chore: use pkg-config resolution
lessp Feb 23, 2020
6f54b4d
chore(ci): does it run on ubuntu and mac
lessp Feb 23, 2020
960c8a8
chore: use piaf from npm
lessp Feb 23, 2020
7471525
chore: use npm version of fetch-core
lessp Feb 23, 2020
dc88d51
chore(ci): try windows as well
lessp Feb 23, 2020
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
18 changes: 9 additions & 9 deletions .github/workflows/pr_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
# os: [ubuntu-latest, macOS-latest, windows-latest]
os: [ubuntu-latest, macOS-latest, windows-latest]
steps:
- uses: actions/setup-node@v1
with:
node-version: 10
node-version: 12.16.1
- uses: actions/checkout@v1
- name: Install esy
run: npm install -g [email protected]
- name: Install dependencies
run: esy install
- name: Build
run: esy build
run: npm install -g @esy-nightly/esy
- name: Build packages
run: |
esy @fetch-core
esy @fetch-native-lwt
esy
- name: Check code formatting
run: esy dune build @fmt --root .
- name: Run tests
run: esy test
run: esy test
- name: Run example
run: esy example
28 changes: 13 additions & 15 deletions esy.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"description": "Fetch libraries and interface for ReasonML/OCaml",
"license": "MIT",
"esy": {
"build": ["dune build -p fetch-core", "dune build -p fetch-native-lwt"],
"build": [
"dune build -p fetch-core",
"dune build -p fetch-native-lwt"
],
"buildDev": "refmterr dune build @all",
"install": [
"esy-installer fetch-core.install",
Expand All @@ -14,7 +17,7 @@
"scripts": {
"example": "esy refmterr dune exec examples/fetch_native_lwt_get.exe",
"format": "esy dune build @fmt --auto-promote",
"test": "esy dune runtest test --force",
"test": "esy dune exec FetchTestRunner",
"test:watch": "esy dune runtest test --watch --force",
"contributors:add": "all-contributors add",
"contributors:generate": "all-contributors generate"
Expand All @@ -23,26 +26,21 @@
"fetch-native-lwt": "*",
"fetch-core": "*",
"@opam/dune": "*",
"@opam/opium_core": "rgrinberg/opium:opium_core.opam",
"@opam/reason": "*",
"@reason-native-web/morph_client": "^0.1.1",
"ocaml": "<4.9.0"
"ocaml": "~4.9.0"
},
"devDependencies": {
"all-contributors-cli": "6.9.1",
"@opam/alcotest": "0.8.5",
"@opam/js_of_ocaml-compiler": "3.4.0",
"@opam/merlin": "^3.3.2",
"@opam/merlin": ">=3.3.2",
"@opam/rtop": "3.5.2",
"@opam/utop": "2.4.2",
"@reason-native/console": "^0.1.0",
"refmterr": "^3.2.2"
"@reason-native/console": "0.1.0",
"@reason-native/rely": "3.2.1",
"all-contributors-cli": "6.9.1",
"refmterr": "*"
},
"resolutions": {
"fetch-core": "link:./fetch-core.json",
"fetch-native-lwt": "link:./fetch-native-lwt.json",
"@opam/httpaf-lwt-unix": "anmonteiro/httpaf:httpaf-lwt-unix.opam#76b461bed081c64908fb1fdfa076ab2c936ca622",
"@opam/httpaf-lwt": "anmonteiro/httpaf:httpaf-lwt.opam#76b461bed081c64908fb1fdfa076ab2c936ca622",
"@opam/httpaf": "anmonteiro/httpaf:httpaf.opam#76b461bed081c64908fb1fdfa076ab2c936ca622"
"@opam/conf-libssl": "esy-packages/esy-openssl#648930fa614886bc189f9b5c31f64f0b663fceee"
}
}
}
Loading