Skip to content

Update vcpkg (with Boost 1.86.0#1) #778

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

Open
ohhmm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update vcpkg (with Boost 1.86.0#1) #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/disabled/conan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
working-directory: ${{github.workspace}}/build
env:
CC: cl
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
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
- name: Install prerequisites with conan
working-directory: ${{github.workspace}}/build
run: cmake --build ${{github.workspace}}/build --target Install__Conan --config Release
Expand Down
2 changes: 1 addition & 1 deletion .github/disabled/windows-no-vcpkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
working-directory: ${{github.workspace}}/build
env:
CC: cl
run: cmake ${{github.workspace}} -G "Ninja Multi-Config" -DOPENMIND_USE_VCPKG=NO -DOPENMIND_BUILD_SAMPLES=OFF -DOPENMIND_BUILD_TESTS=ON -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
run: cmake ${{github.workspace}} -G "Ninja Multi-Config" -DOPENMIND_USE_VCPKG=NO -DOPENMIND_PREFERRED_BOOST_VERSION="1.85.0" -DOPENMIND_BUILD_SAMPLES=OFF -DOPENMIND_BUILD_TESTS=ON -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

- name: Install prerequisites
run: cmake --build ${{github.workspace}}/build --target prerequisites --config Release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
max_attempts: 3
command: |
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
brew install boost-python3 snappy leveldb
brew install autoconf autoconf-archive automake ninja boost-python3 snappy leveldb
- name: Configure
working-directory: ${{github.workspace}}/build
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
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
- name: Install prerequisites
working-directory: ${{github.workspace}}/build
run: cmake --build ${{github.workspace}}/build --target prerequisites -j `sysctl -n hw.ncpu` --config Release
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/vcpkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,17 @@ jobs:
if: runner.os == 'macOS'
env:
VCPKG_PYTHON3: $(which python3)
CXX: $(cmake -L | grep CMAKE_CXX_COMPILER)
uses: nick-fields/retry@v2
with:
timeout_minutes: 10
max_attempts: 3
command: |
echo "VCPKG_PYTHON3=$VCPKG_PYTHON3" >> $GITHUB_ENV
echo "CMAKE_CXX_COMPILER=$CMAKE_CXX_COMPILER" >> $GITHUB_ENV
brew update || brew update || brew update || brew update || brew update
brew install cmake ninja autoconf automake autoconf-archive
brew install cmake ninja autoconf automake autoconf-archive libtool texinfo
brew link --force autoconf automake libtool
cmake --version
ninja --version
clang --version
Expand All @@ -83,7 +86,7 @@ jobs:
- name: Setup vcpkg
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289'
vcpkgGitCommitId: '6f29f12e82a8293156836ad81cc9bf5af41fe836'
vcpkgJsonGlob: '**/vcpkg.json'

- name: Configure CMake
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
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"builtin-baseline": "c82f74667287d3dc386bce81e44964370c91a289",
"builtin-baseline": "6f29f12e82a8293156836ad81cc9bf5af41fe836",
"name": "openmind",
"version": "1.0.0",
"description": "OpenMind",
Expand Down
Loading