From 1823feafdc1bbd2715e1151bb6d8cfa3e769f961 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Mon, 27 May 2024 21:17:06 -0600 Subject: [PATCH] try pinning visual studio boost version to 1.76 --- .github/workflows/ci.yml | 6 ++++-- proj/vs2013/vcpkg.json | 29 +++++++++++++++++++++++++++++ proj/vs2017/vcpkg.json | 29 +++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 proj/vs2013/vcpkg.json create mode 100644 proj/vs2017/vcpkg.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 041363a36..7b41b581b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,8 @@ }, { name: install dependencies, - run: '.\.github\workflows\scripts\win\install-deps.bat x86' + run: 'vcpkg install', + working-directory: 'proj/vs2013' }, { name: build, @@ -90,7 +91,8 @@ }, { name: install dependencies, - run: '.\.github\workflows\scripts\win\install-deps.bat x64' + run: 'vcpkg install', + working-directory: 'proj/vs2017' }, { name: build, diff --git a/proj/vs2013/vcpkg.json b/proj/vs2013/vcpkg.json new file mode 100644 index 000000000..28ed59f4a --- /dev/null +++ b/proj/vs2013/vcpkg.json @@ -0,0 +1,29 @@ +{ + "dependencies": [ + "zlib", + "sfml", + "opengl", + "boost-any", + "boost-dynamic-bitset", + "boost-ptr-container", + "boost-core", + "boost-filesystem", + "boost-system", + "boost-date-time", + "boost-chrono", + "boost-math", + "boost-spirit" + ], + "overrides": [ + { "name": "boost-any", "version": "1.76" }, + { "name": "boost-dynamic-bitset", "version": "1.76" }, + { "name": "boost-ptr-container", "version": "1.76" }, + { "name": "boost-core", "version": "1.76" }, + { "name": "boost-filesystem", "version": "1.76" }, + { "name": "boost-system", "version": "1.76" }, + { "name": "boost-date-time", "version": "1.76" }, + { "name": "boost-chrono", "version": "1.76" }, + { "name": "boost-math", "version": "1.76" }, + { "name": "boost-spirit", "version": "1.76" } + ] +} \ No newline at end of file diff --git a/proj/vs2017/vcpkg.json b/proj/vs2017/vcpkg.json new file mode 100644 index 000000000..28ed59f4a --- /dev/null +++ b/proj/vs2017/vcpkg.json @@ -0,0 +1,29 @@ +{ + "dependencies": [ + "zlib", + "sfml", + "opengl", + "boost-any", + "boost-dynamic-bitset", + "boost-ptr-container", + "boost-core", + "boost-filesystem", + "boost-system", + "boost-date-time", + "boost-chrono", + "boost-math", + "boost-spirit" + ], + "overrides": [ + { "name": "boost-any", "version": "1.76" }, + { "name": "boost-dynamic-bitset", "version": "1.76" }, + { "name": "boost-ptr-container", "version": "1.76" }, + { "name": "boost-core", "version": "1.76" }, + { "name": "boost-filesystem", "version": "1.76" }, + { "name": "boost-system", "version": "1.76" }, + { "name": "boost-date-time", "version": "1.76" }, + { "name": "boost-chrono", "version": "1.76" }, + { "name": "boost-math", "version": "1.76" }, + { "name": "boost-spirit", "version": "1.76" } + ] +} \ No newline at end of file