Skip to content

Commit aec0ac6

Browse files
authored
Bugfix - Dir - Windows: Paths not loaded correctly (#251)
* 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
1 parent a33f152 commit aec0ac6

File tree

27 files changed

+512
-429
lines changed

27 files changed

+512
-429
lines changed

.ci/build-platform.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22
platform: "macOS"
3-
vmImage: "macOS-10.13"
3+
vmImage: "macOS-10.14"
44

55
jobs:
66
- job: ${{ parameters.platform }}
@@ -70,8 +70,12 @@ jobs:
7070
- script: "esy build"
7171
displayName: "esy build"
7272
- template: utils/create-docs.yml
73-
- script: "esy test"
74-
displayName: "Test command"
73+
- script: "esy x TestDev.exe --filter Dir"
74+
displayName: "esy x TestDev.exe --filter Dir (Windows subset)"
75+
condition: eq(variables['AGENT.OS'], 'Windows_NT')
76+
- script: "esy x TestDev.exe"
77+
displayName: "esy x TestDev.exe"
78+
condition: ne(variables['AGENT.OS'], 'Windows_NT')
7579
- script: "esy release"
7680
displayName: "esy release"
7781
- template: utils/publish-build-cache.yml

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- template: .ci/build-platform.yml
1717
parameters:
1818
platform: macOS
19-
vmImage: macOS-10.13
19+
vmImage: macOS-10.14
2020

2121
# Need windows-2019 to do esy import/export-dependencies
2222
# which assumes you have bsdtar (tar.exe) in your system
@@ -35,7 +35,7 @@ jobs:
3535
- macOS
3636
- Windows
3737
pool:
38-
vmImage: macOS-10.13
38+
vmImage: macOS-10.14
3939
demands: node.js
4040
steps:
4141
- template: .ci/cross-release.yml

esy.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
"@opam/sexplib0": "*",
5959
"@opam/odoc": "*"
6060
},
61+
"devDependencies": {
62+
"ocaml": "~4.7.1"
63+
},
6164
"resolutions": {
6265
"@opam/reason": "let-def/reason:reason.opam#474900e6d9d5ecef788fbe78e8a23cb20d151a72"
6366
}

esy.lock/.gitattributes

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)