Skip to content

Commit 9ca567b

Browse files
committed
use ci version of rescript
1 parent 160124e commit 9ca567b

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ env:
2121

2222
jobs:
2323
test-rewatch:
24+
needs:
25+
- publish
2426
runs-on: ubuntu-latest
2527
env:
2628
RUST_BACKTRACE: "1"

rewatch/testrepo/package.json

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
"packages/new-namespace"
1010
]
1111
},
12+
"dependencies": {
13+
"rescript": "ci"
14+
},
1215
"scripts": {
1316
"build": "../target/release/rewatch build .",
1417
"build:rescript": "rescript build -with-deps",

rewatch/testrepo/packages/dep01/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"author": "",
1313
"license": "MIT",
1414
"dependencies": {
15-
"@testrepo/dep02": "*",
16-
"rescript": "*"
15+
"@testrepo/dep02": "*"
1716
}
1817
}

rewatch/testrepo/packages/dep02/package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,5 @@
1010
"rescript"
1111
],
1212
"author": "",
13-
"license": "MIT",
14-
"dependencies": {
15-
"rescript": "*"
16-
}
13+
"license": "MIT"
1714
}

rewatch/testrepo/packages/main/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"author": "",
1313
"license": "MIT",
1414
"dependencies": {
15-
"@testrepo/dep01": "*",
16-
"rescript": "*"
15+
"@testrepo/dep01": "*"
1716
}
1817
}

rewatch/testrepo/packages/new-namespace/package.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,5 @@
55
"rescript"
66
],
77
"author": "",
8-
"license": "MIT",
9-
"dependencies": {
10-
"rescript": "*"
11-
}
8+
"license": "MIT"
129
}

rewatch/tests/suite-ci.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
cd $(dirname $0)
44

55
source ./utils.sh
6-
(cd ../testrepo && yarn install --immutable)
6+
(cd ../testrepo && yarn install)
7+
8+
bold "Reset yarn.lock changes"
9+
git checkout ../testrepo/yarn.lock
10+
success "Reset yarn.lock"
711

812
bold "Check if build exists"
913
if test -f ../target/release/rewatch;

0 commit comments

Comments
 (0)