From ccc95d9149af89d825a03e674bd785aa79eb70dc Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Tue, 16 Jul 2024 17:48:34 +1200 Subject: [PATCH 1/3] Add Apple M-series to CI jobs --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4df3e49..5671216 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,10 @@ jobs: - version: '1.6' os: ubuntu-latest arch: x86 + # Test against Apple M-series + - version: '1' + os: macos-14 + arch: aarch64 steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 From 640aed73add02bbf82ed79de1aec475c95d512d2 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 17 Jul 2024 14:11:09 +1200 Subject: [PATCH 2/3] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 7f0d4a2..3490d4b 100644 --- a/Project.toml +++ b/Project.toml @@ -8,7 +8,7 @@ Clp_jll = "06985876-5285-5a41-9fcb-8948a742cc53" MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" [compat] -Clp_jll = "=100.1700.601, =100.1700.700" +Clp_jll = "=100.1700.601, =100.1700.700, =100.1700.900" MathOptInterface = "1.1" julia = "1.6" From 10015f809dd4880a3747cb1d74436ebc1e063d86 Mon Sep 17 00:00:00 2001 From: odow Date: Wed, 17 Jul 2024 14:45:31 +1200 Subject: [PATCH 3/3] Update --- src/Clp.jl | 3 ++- src/MOI_wrapper/MOI_wrapper.jl | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Clp.jl b/src/Clp.jl index 371abcc..7d60bbf 100644 --- a/src/Clp.jl +++ b/src/Clp.jl @@ -6,13 +6,14 @@ module Clp import Clp_jll +import MathOptInterface as MOI function __init__() global libClp = Clp_jll.libClp version = VersionNumber( "$(Clp_VersionMajor()).$(Clp_VersionMinor()).$(Clp_VersionRelease())", ) - if !(v"1.17.2" <= version <= v"1.17.7") + if !(v"1.17.2" <= version <= v"1.17.9") error( "You have installed version $version of Clp, which is not " * "supported by Clp.jl. If the version change was breaking, changes " * diff --git a/src/MOI_wrapper/MOI_wrapper.jl b/src/MOI_wrapper/MOI_wrapper.jl index c513b8a..1fb8b2a 100644 --- a/src/MOI_wrapper/MOI_wrapper.jl +++ b/src/MOI_wrapper/MOI_wrapper.jl @@ -3,10 +3,6 @@ # Use of this source code is governed by an MIT-style license that can be found # in the LICENSE.md file or at https://opensource.org/licenses/MIT. -import MathOptInterface - -const MOI = MathOptInterface - MOI.Utilities.@product_of_sets( _LPProductOfSets, MOI.EqualTo{T},