Skip to content

Commit 4bf4fbb

Browse files
committed
Update vcpkg (with Boost 1.86.0#1)
1 parent abfe46f commit 4bf4fbb

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/disabled/conan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
working-directory: ${{github.workspace}}/build
3838
env:
3939
CC: cl
40-
run: cmake ${{github.workspace}} -DOPENMIND_USE_CONAN=ON -DOPENMIND_USE_VCPKG=NO -DOPENMIND_BUILD_SAMPLES=NO -DOPENMIND_BUILD_TESTS=ON -D CMAKE_C_COMPILER="cl.exe" -D CMAKE_CXX_COMPILER="cl.exe" -DOPENMIND_MATH_USE_LEVELDB_CACHE=NO -DOPENMIND_STORAGE_LEVELDB=NO
40+
run: cmake ${{github.workspace}} -DOPENMIND_USE_CONAN=ON -DOPENMIND_PREFERRED_BOOST_VERSION="1.85.0" -DOPENMIND_USE_VCPKG=NO -DOPENMIND_BUILD_SAMPLES=NO -DOPENMIND_BUILD_TESTS=ON -D CMAKE_C_COMPILER="cl.exe" -D CMAKE_CXX_COMPILER="cl.exe" -DOPENMIND_MATH_USE_LEVELDB_CACHE=NO -DOPENMIND_STORAGE_LEVELDB=NO
4141
- name: Install prerequisites with conan
4242
working-directory: ${{github.workspace}}/build
4343
run: cmake --build ${{github.workspace}}/build --target Install__Conan --config Release

.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
- name: Create Build Dir
1313
run: cmake -E make_directory ${{github.workspace}}/build
1414
- name: Pre-Install Boost, LevelDB
15-
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" && ( brew install boost-python3 snappy leveldb || brew install boost-python3 snappy leveldb )
15+
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" && ( brew install autoconf autoconf-archive automake ninja boost-python3 snappy leveldb || brew install autoconf autoconf-archive automake ninja boost-python3 snappy leveldb )
1616
- name: Configure
1717
working-directory: ${{github.workspace}}/build
18-
run: cmake ${{github.workspace}} -GXcode -DOPENMIND_BUILD_SAMPLES=OFF -DOPENMIND_BUILD_TESTS=ON -Dleveldb_TAG:STRING="1.23" -DOPENMIND_MATH_USE_LEVELDB_CACHE=OFF -DOPENMIND_STORAGE_LEVELDB=OFF
18+
run: cmake ${{github.workspace}} -GXcode -DOPENMIND_USE_VCPKG=NO -DOPENMIND_BUILD_SAMPLES=OFF -DOPENMIND_BUILD_TESTS=ON -Dleveldb_TAG:STRING="1.23" -DOPENMIND_MATH_USE_LEVELDB_CACHE=OFF -DOPENMIND_STORAGE_LEVELDB=OFF
1919
- name: Install prerequisites
2020
working-directory: ${{github.workspace}}/build
2121
run: cmake --build ${{github.workspace}}/build --target prerequisites -j `sysctl -n hw.ncpu` --config Release

.github/workflows/vcpkg.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ jobs:
5959
- name: Setup vcpkg
6060
uses: lukka/run-vcpkg@v11
6161
with:
62-
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
62+
vcpkgGitCommitId: '6f29f12e82a8293156836ad81cc9bf5af41fe836'
6363
vcpkgJsonGlob: '**/vcpkg.json'
6464

6565
- name: Configure CMake
66-
run: cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake -DOPENMIND_BUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install || cmake -B ${{github.workspace}}/build -G Ninja -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake -DOPENMIND_BUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
66+
run: cmake -B ${{github.workspace}}/build -G "Ninja Multi-Config" -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake -DOPENMIND_BUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install || cmake -B ${{github.workspace}}/build -G "Ninja Multi-Config" -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake -DOPENMIND_BUILD_TESTS=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install
6767

6868
- name: Build
69-
run: cmake --build ${{github.workspace}}/build
69+
run: cmake --build ${{github.workspace}}/build --config Release
7070

7171
- name: Install
7272
run: cmake --install ${{github.workspace}}/build --prefix ${{github.workspace}}/install
@@ -77,4 +77,4 @@ jobs:
7777

7878
- name: Check
7979
working-directory: ${{github.workspace}}/build
80-
run: ctest . -j ${{steps.cpu-cores.outputs.count}} -E "ts" --rerun-failed --output-on-failure
80+
run: ctest . -C Release -j ${{steps.cpu-cores.outputs.count}} -E "ts" --rerun-failed --output-on-failure

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
working-directory: ${{github.workspace}}/build
2828
env:
2929
CC: cl
30-
run: cmake ${{github.workspace}} -DOPENMIND_USE_VCPKG=NO -DOPENMIND_BUILD_SAMPLES=OFF -DOPENMIND_BUILD_TESTS=ON -G "Ninja Multi-Config" -D CMAKE_C_COMPILER="cl.exe" -D CMAKE_CXX_COMPILER="cl.exe" -Dleveldb_TAG:STRING="1.23" -DOPENMIND_MATH_USE_LEVELDB_CACHE=NO -DOPENMIND_STORAGE_LEVELDB=NO
30+
run: cmake ${{github.workspace}} -DOPENMIND_USE_VCPKG=NO -DOPENMIND_PREFERRED_BOOST_VERSION="1.85.0" -DOPENMIND_BUILD_SAMPLES=OFF -DOPENMIND_BUILD_TESTS=ON -G "Ninja Multi-Config" -D CMAKE_C_COMPILER="cl.exe" -D CMAKE_CXX_COMPILER="cl.exe" -Dleveldb_TAG:STRING="1.23" -DOPENMIND_MATH_USE_LEVELDB_CACHE=NO -DOPENMIND_STORAGE_LEVELDB=NO
3131

3232
- name: Install prerequisites
3333
run: cmake --build ${{github.workspace}}/build --target prerequisites --config Release

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
3-
"builtin-baseline": "c82f74667287d3dc386bce81e44964370c91a289",
3+
"builtin-baseline": "6f29f12e82a8293156836ad81cc9bf5af41fe836",
44
"name": "openmind",
55
"version": "1.0.0",
66
"description": "OpenMind",

0 commit comments

Comments
 (0)