diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml index 764635d9279..10a1465192a 100644 --- a/.github/workflows/doxygen.yml +++ b/.github/workflows/doxygen.yml @@ -13,8 +13,7 @@ jobs: runs-on: ubuntu-latest permissions: contents: write - container: - image: docker://rippleci/rippled-ci-builder:2944b78d22db + container: rippleci/rippled-build-ubuntu:aaf5e3e steps: - name: checkout uses: actions/checkout@v4 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 99aa6b7a9df..566fae55c44 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -23,6 +23,10 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 + - name: install Conan + run: | + brew install conan@1 + echo '/opt/homebrew/opt/conan@1/bin' >> $GITHUB_PATH - name: install Ninja if: matrix.generator == 'Ninja' run: brew install ninja @@ -35,7 +39,8 @@ jobs: cmake --version - name: configure Conan run : | - conan profile get env.CXXFLAGS default || true + conan profile new default --detect || true + conan profile update settings.compiler.cppstd=20 default conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]' default - name: build dependencies uses: ./.github/actions/dependencies diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f103a40d7f7..6aa2bbe706b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -56,6 +56,7 @@ jobs: shell: bash run: | conan profile new default --detect + conan profile update settings.compiler.cppstd=20 default conan profile update settings.compiler.runtime=MT${{ matrix.configuration == 'Debug' && 'd' || '' }} default - name: build dependencies uses: ./.github/actions/dependencies