Skip to content

Fix restart float test and vcpkg Windows CI #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zayenz merged 2 commits into from
Sep 6, 2026
+5 −5
Merged

Fix restart float test and vcpkg Windows CI #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70b1602
Constrain restart float test output
Sep 6, 2026
b5acb16
Update vcpkg pin for GMP Windows builds
Sep 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/flatzinc/on_restart_sol_float.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
Loading