From 70b1602823911f09cd58c013867c27dd5a84eff6 Mon Sep 17 00:00:00 2001 From: Mikael Zayenz Lagerkvist Date: Sun, 6 Sep 2026 11:16:13 +0200 Subject: [PATCH 1/2] Constrain restart float test output --- test/flatzinc/on_restart_sol_float.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/flatzinc/on_restart_sol_float.cpp b/test/flatzinc/on_restart_sol_float.cpp index 1966585beb..1539d75fe8 100644 --- a/test/flatzinc/on_restart_sol_float.cpp +++ b/test/flatzinc/on_restart_sol_float.cpp @@ -47,7 +47,7 @@ R"FZN(predicate gecode_on_restart_sol_float(var float: input,var float: out); predicate gecode_on_restart_status(var int: s); predicate int_eq_imp(var int: a,var int: b,var bool: r); var 1..3: x:: output_var; -var float: y:: output_var; +var 1.0..3.0: y:: output_var; var 1.0..3.0: X_INTRODUCED_2_ ::var_is_introduced :: is_defined_var; var 1.0..3.0: X_INTRODUCED_3_ ::var_is_introduced ; var bool: X_INTRODUCED_4_ ::var_is_introduced :: is_defined_var; From b5acb1692152d0f64e379446295b5ac92b311277 Mon Sep 17 00:00:00 2001 From: Mikael Zayenz Lagerkvist Date: Sun, 6 Sep 2026 11:40:19 +0200 Subject: [PATCH 2/2] Update vcpkg pin for GMP Windows builds --- .github/workflows/build.yml | 6 +++--- vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7630dcdeff..b8457a5e7f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -428,9 +428,9 @@ jobs: uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4 with: path: ${{ runner.temp }}\vcpkg-binary-cache - key: vcpkg-${{ runner.os }}-x64-windows-d015e31e90838a4c9dfa3eed45979bc70d9357fc-${{ hashFiles('vcpkg.json') }} + key: vcpkg-${{ runner.os }}-x64-windows-37bb045f3c7a747d3e5d1c13b6fe6a0aec4b5d00-${{ hashFiles('vcpkg.json') }} restore-keys: | - vcpkg-${{ runner.os }}-x64-windows-d015e31e90838a4c9dfa3eed45979bc70d9357fc- + vcpkg-${{ runner.os }}-x64-windows-37bb045f3c7a747d3e5d1c13b6fe6a0aec4b5d00- - name: Setup vcpkg shell: pwsh @@ -439,7 +439,7 @@ jobs: $vcpkgBinaryCache = Join-Path $env:RUNNER_TEMP "vcpkg-binary-cache" New-Item -ItemType Directory -Force -Path $vcpkgBinaryCache | Out-Null git clone https://github.com/microsoft/vcpkg $vcpkgRoot - git -C $vcpkgRoot checkout d015e31e90838a4c9dfa3eed45979bc70d9357fc + git -C $vcpkgRoot checkout 37bb045f3c7a747d3e5d1c13b6fe6a0aec4b5d00 & (Join-Path $vcpkgRoot "bootstrap-vcpkg.bat") -disableMetrics "VCPKG_ROOT=$vcpkgRoot" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append "VCPKG_DEFAULT_BINARY_CACHE=$vcpkgBinaryCache" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append diff --git a/vcpkg.json b/vcpkg.json index 7af80062c3..676c016b61 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "gecode", "version-string": "6.4.0", - "builtin-baseline": "01e2abc86d9a6e2bee0f6355eb7f8650b6cea100", + "builtin-baseline": "37bb045f3c7a747d3e5d1c13b6fe6a0aec4b5d00", "dependencies": [ "mpfr" ]