From f7d4cc64fb81ba211404b56addeeda14044a3203 Mon Sep 17 00:00:00 2001 From: odow Date: Thu, 29 Feb 2024 15:04:12 +1300 Subject: [PATCH] Drop Windows test --- .github/workflows/ci.yml | 2 +- deps/build.jl | 2 +- src/Xpress.jl | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd1ec815..a551dac4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/deps/build.jl b/deps/build.jl index fc6c3719..ab9d9933 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -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. diff --git a/src/Xpress.jl b/src/Xpress.jl index 0682eaea..faab4255 100644 --- a/src/Xpress.jl +++ b/src/Xpress.jl @@ -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)"