Skip to content

Commit 1c4b63d

Browse files
simplify away ppx_let test which causes failures
1 parent 15004d5 commit 1c4b63d

File tree

9 files changed

+35
-49
lines changed

9 files changed

+35
-49
lines changed

.github/workflows/workflow.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191

9292
- run: opam install lwt_react lwt --deps-only --with-test
9393

94-
- run: opam install lwt_ppx lwt_ppx_let --deps-only --with-test
94+
- run: opam install lwt_ppx --deps-only --with-test
9595
if: ${{ matrix.ppx == true }}
9696

9797
- run: opam exec -- dune build --only-packages lwt_react,lwt
@@ -104,9 +104,6 @@ jobs:
104104
- run: opam exec -- dune runtest --only-packages lwt_ppx
105105
if: ${{ matrix.ppx == true }}
106106

107-
- run: opam exec -- make ppx_let-test
108-
if: ${{ matrix.ppx == true }}
109-
110107
lint-opam:
111108
runs-on: ubuntu-latest
112109

dune-project

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,13 @@
1212
(source (github ocsigen/lwt))
1313
(documentation "https://ocsigen.org/lwt")
1414

15-
(package
16-
(name lwt_ppx_let)
17-
(synopsis "Dummy package context for ppx_let tests")
18-
(description "Internal package used to partition ppx_let tests.")
19-
(depends
20-
(ocaml (>= 4.08))
21-
(ppx_let :with-test)
22-
lwt))
23-
2415
(package
2516
(name lwt_ppx)
2617
(synopsis "PPX syntax for Lwt, providing something similar to async/await from JavaScript")
2718
(depends
2819
(ocaml (>= 4.08))
2920
(ppxlib (>= 0.16.0))
21+
(ppx_let :with-test)
3022
lwt))
3123

3224
(package

lwt.opam.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ build: [
2222
"@doc" {with-doc}
2323
]
2424
]
25+
available: os-family != "windows" | "ocaml-version" < "5.2"

lwt_ppx.opam

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ depends: [
1414
"dune" {>= "2.0"}
1515
"ocaml" {>= "4.08"}
1616
"ppxlib" {>= "0.16.0"}
17+
"ppx_let" {with-test}
1718
"lwt"
1819
]
20+
dev-repo: "git+https://github.com/ocsigen/lwt.git"
1921
build: [
2022
["dune" "subst"] {dev}
2123
[
@@ -30,4 +32,3 @@ build: [
3032
"@doc" {with-doc}
3133
]
3234
]
33-
dev-repo: "git+https://github.com/ocsigen/lwt.git"

lwt_ppx.opam.template

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
build: [
2+
["dune" "subst"] {dev}
3+
[
4+
"dune"
5+
"build"
6+
"-p"
7+
name
8+
"-j"
9+
jobs
10+
"@install"
11+
"@runtest" {with-test}
12+
"@doc" {with-doc}
13+
]
14+
]

lwt_ppx_let.opam

Lines changed: 0 additions & 33 deletions
This file was deleted.

lwt_react.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ depends: [
1616
"lwt" {>= "3.0.0"}
1717
"react" {>= "1.0.0"}
1818
]
19+
dev-repo: "git+https://github.com/ocsigen/lwt.git"
1920
build: [
2021
["dune" "subst"] {dev}
2122
[
@@ -30,4 +31,3 @@ build: [
3031
"@doc" {with-doc}
3132
]
3233
]
33-
dev-repo: "git+https://github.com/ocsigen/lwt.git"

lwt_react.opam.template

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
build: [
2+
["dune" "subst"] {dev}
3+
[
4+
"dune"
5+
"build"
6+
"-p"
7+
name
8+
"-j"
9+
jobs
10+
"@install"
11+
"@runtest" {with-test}
12+
"@doc" {with-doc}
13+
]
14+
]

test/ppx_let/dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
(rule
77
(alias runtest)
8-
(package lwt_ppx_let)
8+
(package lwt_ppx) ;; technically not part of lwt_ppx, but we want it tested and the dependency to ppxlib is already there
99
(action (run %{exe:test.exe})))

0 commit comments

Comments
 (0)