-
Notifications
You must be signed in to change notification settings - Fork 470
Rewatch windows support #7477
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
Merged
Merged
Rewatch windows support #7477
Changes from all commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
65d7f78
add rescript 12 as dep
jfrolich 8ce238d
paths wip - windows support
jfrolich 44b6605
log error
jfrolich 1f957a1
fix bug
jfrolich 36aae3d
fix bug
jfrolich d7b2311
paths wip - windows support
jfrolich 959caa4
wip
jfrolich 0094a31
fix another path issue
jfrolich 69580cc
remove logging
jfrolich 0526247
remove dep on rescript core for v12
jfrolich a819a62
remove core - snapshots
jfrolich 04b6714
See if it works on CI
jfrolich 2f65284
don't skip install
jfrolich ec5de6f
default the bsc path to the one in the repo
jfrolich 90aeb9c
copy stdlib build artifacts to the test repo after building the runtime
jfrolich 43a6275
also run non-integration tests
jfrolich f33e1d5
make it work when no node-modules are installed
jfrolich b249165
fix?
jfrolich aaf1719
fix lockfile
jfrolich 2c23b76
see error
jfrolich ccc7b53
fix?
jfrolich 1b83ac3
fix?
jfrolich 03448b4
Revert "see error"
jfrolich 45d6c51
fix path
jfrolich 40f0387
fix: verbatim windows paths
Bushuo 44696a5
fix: incremental build on windows `get_res_path_from_ast`
Bushuo ae18ec0
fix: file paths in snapshots by normalizing on windows
Bushuo 5d935a9
debug: print bash version
Bushuo 2ac6f3a
fix CI output
jfrolich d659af6
improve CI output
jfrolich 7ce8778
Revert "debug: print bash version"
Bushuo 97a89bc
feat: add snapshot_output to IncrementalBuildError
Bushuo a57f118
test: update snapshots
Bushuo 4cf3b1a
test: `build` to check for lock
Bushuo f6bec19
debug: check output after watch
Bushuo b4d39df
test: sleep longer
Bushuo caed520
sleep longer for mac os
jfrolich 3c9de5b
fix typo
jfrolich 097d6e6
fix typo in snapshots
jfrolich File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -98,6 +98,9 @@ jobs: | |
| - name: Install npm packages | ||
| run: yarn install | ||
|
|
||
| - name: Install testrepo deps | ||
| run: cd rewatch/testrepo && yarn install | ||
|
|
||
| - name: Install dependencies (Linux) | ||
| if: runner.os == 'Linux' | ||
| uses: awalsh128/[email protected] | ||
|
|
@@ -133,6 +136,8 @@ jobs: | |
| - name: Copy rewatch binary | ||
| run: | | ||
| cp rewatch/target/${{ matrix.rust-target }}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }} rewatch | ||
| mkdir -p rewatch/target/release | ||
| cp rewatch/target/${{ matrix.rust-target }}/release/rewatch${{ runner.os == 'Windows' && '.exe' || '' }} rewatch/target/release | ||
| ./scripts/copyExes.js --rewatch | ||
| shell: bash | ||
|
|
||
|
|
@@ -354,6 +359,9 @@ jobs: | |
| if: runner.os != 'Windows' | ||
| run: make -C tests/gentype_tests/typescript-react-example clean test | ||
|
|
||
| - name: Run rewatch tests | ||
| run: make test-rewatch | ||
|
|
||
| - name: Run syntax benchmarks | ||
| if: matrix.benchmarks | ||
| run: ./_build/install/default/bin/syntax_benchmarks | tee tests/benchmark-output.json | ||
|
|
@@ -507,7 +515,6 @@ jobs: | |
| working-directory: ${{ steps.tmp-dir.outputs.path }} | ||
|
|
||
| - name: Install ReScript package in rewatch/testrepo | ||
| if: runner.os == 'Linux' | ||
| run: | | ||
| COMMIT_SHA="${{ github.event.pull_request.head.sha || github.sha }}" | ||
| yarn add "rescript@https://pkg.pr.new/rescript-lang/rescript@${COMMIT_SHA::7}" | ||
|
|
@@ -516,8 +523,7 @@ jobs: | |
|
|
||
| - name: Run rewatch integration tests | ||
| # Currently failing on Windows and intermittently on macOS | ||
| if: runner.os == 'Linux' | ||
| run: make test-rewatch-ci | ||
| run: make test-rewatch-integration | ||
|
|
||
| publish: | ||
| needs: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally
rewatch/testreposhould be added to the yarn workspaces, then we wouldn't need this. We can look into that in a separate PR though.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Behavior is slightly different then. It's better to have a separate independent workspace for testing. If we add it to the monorepo, the dependencies would be hoisted to the rescript root, so we have a monorepo inside a monorepo.