From 53f377f3fd8d8bf3a294580179991a3506eaaf64 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 3 Nov 2023 14:41:22 +1300 Subject: [PATCH 1/2] Update CI to use latest license --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31d00ba..73a8b57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,9 +30,9 @@ jobs: ${{ runner.os }}- - shell: bash env: - ARTELYS_LIC_5006_JUMP_DEV_2022_08_24: ${{ secrets.ARTELYS_LIC_5006_JUMP_DEV_2022_08_24 }} + ARTELYS_LIC_JUMP_DEV: ${{ secrets.ARTELYS_LIC_8326_JUMP_DEV_2023_11_02 }} run: | - echo "$ARTELYS_LIC_5006_JUMP_DEV_2022_08_24" > ~/artelys_lic.txt + echo "$ARTELYS_LIC_JUMP_DEV" > ~/artelys_lic.txt - uses: julia-actions/julia-buildpkg@v1 env: SECRET_KNITRO_URL: ${{ secrets.SECRET_KNITRO_URL }} From 5c88e1a37651b3636f605aa998b286152ef36e1c Mon Sep 17 00:00:00 2001 From: odow Date: Fri, 3 Nov 2023 14:57:06 +1300 Subject: [PATCH 2/2] Fix timeLimitSec --- src/MOI_wrapper.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/MOI_wrapper.jl b/src/MOI_wrapper.jl index a153959..2d116bb 100644 --- a/src/MOI_wrapper.jl +++ b/src/MOI_wrapper.jl @@ -224,7 +224,8 @@ end MOI.supports(model::Optimizer, ::MOI.TimeLimitSec) = true function MOI.get(model::Optimizer, ::MOI.TimeLimitSec) - return KN_get_double_param(model.inner, KN_PARAM_MAXTIMECPU) + ret = KN_get_double_param(model.inner, KN_PARAM_MAXTIMECPU) + return ret == 1e8 ? nothing : ret end function MOI.set(model::Optimizer, ::MOI.TimeLimitSec, value)