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

This commit is contained in:
Ayaz Salikhov
2025-06-17 19:26:25 +01:00
committed by GitHub
parent 67b27ee344
commit f20efae75a
7 changed files with 46 additions and 35 deletions

View File

@@ -1,22 +0,0 @@
name: Setup conan
description: Setup conan profile and artifactory
inputs:
conan_profile:
description: Conan profile name
required: true
runs:
using: composite
steps:
- name: Create conan profile on macOS
if: ${{ runner.os == 'macOS' }}
shell: bash
run: |
conan profile detect --name "${{ inputs.conan_profile }}" --force
sed -i '' 's/compiler.cppstd=[^ ]*/compiler.cppstd=20/' "${{ env.CONAN_HOME }}/profiles/${{ inputs.conan_profile }}"
- name: Add artifactory remote
shell: bash
run: |
conan remote add --index 0 --force ripple http://18.143.149.228:8081/artifactory/api/conan/dev

View File

@@ -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

View File

@@ -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

View File

@@ -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 }}

View File

@@ -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:

View File

@@ -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

View File

@@ -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 }}