8000 fix: Use new CI image with global.conf for sanitizers to affect packa… by mathbunnyru · Pull Request #2234 · XRPLF/clio · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: Use new CI image with global.conf for sanitizers to affect packa… #2234

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.

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

Merged
merged 3 commits into from
Jun 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
8000
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions .github/actions/setup_conan/action.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/actions/setup_conan_macos/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Setup conan
description: Setup conan profile and artifactory on macOS runner

inputs:
conan_profile:
description: Conan profile name
required: true
global_conf_file:
description: Path to global.conf file
required: true

runs:
using: composite
steps:
- name: Fail on non-macOS
if: runner.os != 'macOS'
shell: bash
run: exit 1

- name: Check profile name is default_apple_clang
if: inputs.conan_profile != 'default_apple_clang'
shell: bash
run: exit 1

- name: Create conan profile
shell: bash
run: |
conan profile detect --name "${{ inputs.conan_profile }}"
sed -i '' 's/compiler.cppstd=[^ ]*/compiler.cppstd=20/' "${{ env.CONAN_HOME }}/profiles/${{ inputs.conan_profile }}"

- name: Copy global.conf
shell: bash
run: |
cp "${{ inputs.global_conf_file }}" "${{ env.CONAN_HOME }}/global.conf"

- name: Add artifactory remote
shell: bash
run: |
conan remote add --index 0 ripple http://18.143.149.228:8081/artifactory/api/conan/dev
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ updates:
target-branch: develop

- package-ecosystem: github-actions
directory: .github/actions/setup_conan/
directory: .github/actions/setup_conan_macos/
schedule:
interval: weekly
day: monday
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build_impl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,11 @@ jobs:
disable_ccache: ${{ inputs.disable_cache }}

- name: Setup conan
uses: ./.github/actions/setup_conan
if: runner.os == 'macOS'
uses: ./.github/actions/setup_conan_macos
with:
conan_profile: ${{ inputs.conan_profile }}
global_conf_file: docker/ci/conan/global.conf

- name: Restore cache
if: ${{ !inputs.disable_cache }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/check_libxrpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ jobs:
with:
disable_ccache: true

- name: Setup conan
uses: ./.github/actions/setup_conan
with:
conan_profile: ${{ env.CONAN_PROFILE }}

- name: Run conan and cmake
uses: ./.github/actions/generate
with:
Expand Down
8000
5 changes: 0 additions & 5 deletions .github/workflows/clang-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ jobs:
with:
disable_ccache: true

- name: Setup conan
uses: ./.github/actions/setup_conan
with:
conan_profile: ${{ env.CONAN_PROFILE }}

- name: Restore cache
uses: ./.github/actions/restore_cache
id: restore_cache
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/upload_conan_deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@ jobs:
disable_ccache: true

- name: Setup conan
uses: ./.github/actions/setup_conan
if: runner.os == 'macOS'
uses: ./.github/actions/setup_conan_macos
with:
conan_profile: ${{ env.CONAN_PROFILE }}
global_conf_file: docker/ci/conan/global.conf

- name: Show conan profile
run: conan profile show --profile:all ${{ env.CONAN_PROFILE }}
Expand Down
Loading
0