Skip to content

Commit

Permalink
Bugfix - Dir - Windows: Paths not loaded correctly (#251)
Browse files Browse the repository at this point in the history
* Windows Fixes: Return path; defer loading

* Fix up compilation / tests

* Formatting

* Get a subset of windows tests running on CI

* Add msg parameter to getOrThrow

* More CI tweaks

* macOS 10.13 -> 10.14

* Add ~fromPlatform to absolute Fp methods

* Add devDep for ocaml 4.7.1, update lockfile

* Fix broken yml

* Remove failing test case

* Fix invalid yml again

* Run a subset of tests on windows

* neq -> ne
  • Loading branch information
bryphe authored Feb 17, 2021
1 parent a33f152 commit aec0ac6
Show file tree
Hide file tree
Showing 27 changed files with 512 additions and 429 deletions.
10 changes: 7 additions & 3 deletions .ci/build-platform.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
platform: "macOS"
vmImage: "macOS-10.13"
vmImage: "macOS-10.14"

jobs:
- job: ${{ parameters.platform }}
Expand Down Expand Up @@ -70,8 +70,12 @@ jobs:
- script: "esy build"
displayName: "esy build"
- template: utils/create-docs.yml
- script: "esy test"
displayName: "Test command"
- script: "esy x TestDev.exe --filter Dir"
displayName: "esy x TestDev.exe --filter Dir (Windows subset)"
condition: eq(variables['AGENT.OS'], 'Windows_NT')
- script: "esy x TestDev.exe"
displayName: "esy x TestDev.exe"
condition: ne(variables['AGENT.OS'], 'Windows_NT')
- script: "esy release"
displayName: "esy release"
- template: utils/publish-build-cache.yml
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- template: .ci/build-platform.yml
parameters:
platform: macOS
vmImage: macOS-10.13
vmImage: macOS-10.14

# Need windows-2019 to do esy import/export-dependencies
# which assumes you have bsdtar (tar.exe) in your system
Expand All @@ -35,7 +35,7 @@ jobs:
- macOS
- Windows
pool:
vmImage: macOS-10.13
vmImage: macOS-10.14
demands: node.js
steps:
- template: .ci/cross-release.yml
3 changes: 3 additions & 0 deletions esy.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
"@opam/sexplib0": "*",
"@opam/odoc": "*"
},
"devDependencies": {
"ocaml": "~4.7.1"
},
"resolutions": {
"@opam/reason": "let-def/reason:reason.opam#474900e6d9d5ecef788fbe78e8a23cb20d151a72"
}
Expand Down
2 changes: 1 addition & 1 deletion esy.lock/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit aec0ac6

Please sign in to comment.