Skip to content

Commit 871342b

Browse files
committed
Add support for Windows
1 parent 8c7a7d3 commit 871342b

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
version: ['1.6', '1'] # Test against LTS and current minor release
19-
os: [ubuntu-latest, macOS-latest] # MiniZinc_jll broken on windows-latest
19+
os: [ubuntu-latest, macOS-latest, windows-latest]
2020
arch: [x64]
2121
steps:
2222
- uses: actions/checkout@v4

README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,8 @@ import Pkg
3232
Pkg.add("MiniZinc")
3333
```
3434

35-
**Windows**
36-
37-
On Linux and macOS, this package automatically installs `libminizinc`. However,
38-
we're still working out problems with the install on Windows. To use
39-
MiniZinc.jl, you'll need to manually install a copy of `libminizinc` from
40-
[minizinc.org](https://www.minizinc.org) or compile one yourself from
41-
[MiniZinc/libminizinc](https://github.com/MiniZinc/libminizinc).
42-
43-
To teach MiniZinc.jl where to look for `libminizinc`, set the
44-
`JULIA_LIBMINIZINC_DIR` environment variable. For example:
35+
To use a custom install of MiniZinc, set the `JULIA_LIBMINIZINC_DIR` environment
36+
variable. For example:
4537
```julia
4638
ENV["JULIA_LIBMINIZINC_DIR"] = "C:\\Program Files\\MiniZinc"
4739
```

src/optimize.jl

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,8 @@ function _minizinc_exe(f::F) where {F}
6161
else
6262
return f(joinpath(user_dir, "minizinc"))
6363
end
64-
elseif Sys.islinux() || Sys.isapple()
65-
return f(MiniZinc_jll.minizinc())
6664
end
67-
return error(
68-
"Unable to call libminizinc. Please manually install a copy and set " *
69-
"the `JULIA_LIBMINIZINC_DIR` environment variable. See the README.md " *
70-
"for more details",
71-
)
65+
return f(MiniZinc_jll.minizinc())
7266
end
7367

7468
function _run_minizinc(dest::Optimizer)

0 commit comments

Comments
 (0)