Skip to content

Commit f90d8a3

Browse files
committed
Setup default conan profile in each action
1 parent 9b655b1 commit f90d8a3

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

.github/workflows/bolt-build-base/action.yml renamed to .github/actions/bolt-build-base/action.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@ description: 'Executes necessary commands to setup environment for the bolt buil
33
runs:
44
using: "composite"
55
steps:
6-
- name: Activate Python venv
6+
- name: Setup conan profile
77
shell: bash
8-
run: echo "/root/venv/bin" >> $GITHUB_PATH
8+
run: |
9+
conan profile detect
10+
sed -i 's/gnu14/gnu17/g' ~/.conan2/profiles/default
11+
cat >> ~/.conan2/profiles/default <<EOF
12+
13+
[conf]
14+
tools.build:exelinkflags=['-fuse-ld=mold', '-Wl,--allow-multiple-definition']
15+
tools.build:sharedlinkflags=['-fuse-ld=mold', '-Wl,--allow-multiple-definition']
16+
EOF
917
1018
- name: Add CI conan remote
1119
shell: bash

.github/workflows/build-test.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ concurrency:
2929
cancel-in-progress: true
3030

3131
env:
32-
CONAN_HOME: /root/.conan2
3332
CCACHE_DIR: /data/ccache-data
3433
CCACHE_MAX_SIZE: '100G'
3534
CI_NUM_THREADS: "16"
@@ -59,6 +58,7 @@ jobs:
5958
runs-on: [ self-hosted, medium ]
6059
container:
6160
image: bolt-registry:5000/bolt-ci:20251217
61+
options: --user root
6262
volumes:
6363
- /data/ccache-data:/data/ccache-data
6464
services:
@@ -72,10 +72,11 @@ jobs:
7272
steps:
7373
- name: Checkout code
7474
uses: actions/checkout@v6
75+
7576
- id: env-setup
76-
uses: ./.github/workflows/bolt-build-base
77+
uses: ./.github/actions/bolt-build-base
7778

78-
- name: Bolt Build
79+
- name: Bolt build
7980
run: |
8081
make ${{ matrix.build_type }}_with_test
8182
@@ -91,6 +92,7 @@ jobs:
9192
image: bolt-registry:5000/bolt-ci:20251217
9293
volumes:
9394
- /data/ccache-data:/data/ccache-data
95+
options: --user root
9496
services:
9597
conanserver:
9698
image: bolt-registry:5000/conan-server:latest
@@ -99,10 +101,10 @@ jobs:
99101
steps:
100102
- name: Checkout code
101103
uses: actions/checkout@v6
104+
102105
- id: env-setup
103-
uses: ./.github/workflows/bolt-build-base
106+
uses: ./.github/actions/bolt-build-base
104107

105-
- name: Bolt Build
108+
- name: Bolt build
106109
run: |
107-
source /root/venv/bin/activate
108110
make benchmarks-build

.github/workflows/clang-format.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ jobs:
4848
needs: changes
4949
if: ${{ needs.changes.outputs.source_changed == 'true' }}
5050
runs-on: [ self-hosted, small ]
51-
container: bolt-registry:5000/bolt-ci:20251217
51+
container:
52+
image: bolt-registry:5000/bolt-ci:20251217
53+
options: --user root
5254
steps:
5355
- name: Checkout code
5456
uses: actions/checkout@v6

0 commit comments

Comments
 (0)