Skip to content

Commit

Permalink
Drop Windows test
Browse files Browse the repository at this point in the history
  • Loading branch information
odow committed Feb 29, 2024
1 parent e466b76 commit f7d4cc6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
version: ['1.6', '1'] # Test against LTS and current minor release
os: [ubuntu-latest, macOS-latest, windows-latest]
os: [ubuntu-latest, macOS-latest]
arch: [x64]
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function local_installation()
end
end

if !found && !(Sys.isapple() || Sys.islinux() || Sys.iswindows())
if !found && !(Sys.isapple() || Sys.islinux())
error("""
Unable to locate Xpress installation.
Please check your enviroment variable XPRESSDIR.
Expand Down
12 changes: 6 additions & 6 deletions src/Xpress.jl
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ elseif Sys.islinux() # Use the artifact instead.
)
# Annoyingly, Xpress has the version after extension
const libxprs = joinpath(xpressdlpath, "libxprs.so.42")
elseif Sys.iswindows() # Use the artifact instead.
const xpressdlpath = joinpath(
LazyArtifacts.artifact"xpresspy",
joinpath("Lib", "site-packages", "xpress", "lib"),
)
const libxprs = joinpath(xpressdlpath, "xprs.dll")
# elseif Sys.iswindows() # Use the artifact instead.
# const xpressdlpath = joinpath(
# LazyArtifacts.artifact"xpresspy",
# joinpath("Lib", "site-packages", "xpress", "lib"),
# )
# const libxprs = joinpath(xpressdlpath, "xprs.dll")
elseif haskey(ENV, "XPRESS_JL_NO_DEPS_ERROR")
const xpressdlpath = ""
const libxprs = (Sys.iswindows() ? "" : "lib") * "xprs.$(Libdl.dlext)"
Expand Down

0 comments on commit f7d4cc6

Please sign in to comment.