diff --git a/.github/disabled/conan.yml b/.github/disabled/conan.yml index 024437c2a..4777965d2 100644 --- a/.github/disabled/conan.yml +++ b/.github/disabled/conan.yml @@ -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 diff --git a/.github/disabled/windows-no-vcpkg.yml b/.github/disabled/windows-no-vcpkg.yml index 5c37bc34b..29c6ad000 100644 --- a/.github/disabled/windows-no-vcpkg.yml +++ b/.github/disabled/windows-no-vcpkg.yml @@ -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 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0ea424196..de0419e30 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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 diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml index b71df2b35..bbcd0bbaa 100644 --- a/.github/workflows/vcpkg.yml +++ b/.github/workflows/vcpkg.yml @@ -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 @@ -83,7 +86,7 @@ jobs: - name: Setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 'c82f74667287d3dc386bce81e44964370c91a289' + vcpkgGitCommitId: '6f29f12e82a8293156836ad81cc9bf5af41fe836' vcpkgJsonGlob: '**/vcpkg.json' - name: Configure CMake diff --git a/vcpkg.json b/vcpkg.json index e2a27332e..3c9f6982a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -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",