Skip to content

Commit 69143d7

Browse files
Fix workflows (XRPLF#4951)
- Update container for Doxygen workflow. Matches Linux workflow, with newer GLIBC version required by newer actions. - Fixes macOS workflow to install and configure Conan correctly. Still fails on tests, but that does not seem attributable to the workflow.
1 parent 0c32fc5 commit 69143d7

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

.github/workflows/doxygen.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
permissions:
1515
contents: write
16-
container:
17-
image: docker://rippleci/rippled-ci-builder:2944b78d22db
16+
container: rippleci/rippled-build-ubuntu:aaf5e3e
1817
steps:
1918
- name: checkout
2019
uses: actions/checkout@v4

.github/workflows/macos.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323
steps:
2424
- name: checkout
2525
uses: actions/checkout@v4
26+
- name: install Conan
27+
run: |
28+
brew install conan@1
29+
echo '/opt/homebrew/opt/conan@1/bin' >> $GITHUB_PATH
2630
- name: install Ninja
2731
if: matrix.generator == 'Ninja'
2832
run: brew install ninja
@@ -35,7 +39,8 @@ jobs:
3539
cmake --version
3640
- name: configure Conan
3741
run : |
38-
conan profile get env.CXXFLAGS default || true
42+
conan profile new default --detect || true
43+
conan profile update settings.compiler.cppstd=20 default
3944
conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]' default
4045
- name: build dependencies
4146
uses: ./.github/actions/dependencies

.github/workflows/windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
shell: bash
5757
run: |
5858
conan profile new default --detect
59+
conan profile update settings.compiler.cppstd=20 default
5960
conan profile update settings.compiler.runtime=MT${{ matrix.configuration == 'Debug' && 'd' || '' }} default
6061
- name: build dependencies
6162
uses: ./.github/actions/dependencies

0 commit comments

Comments
 (0)