Skip to content

Commit e7619d1

Browse files
committed
try fix ci
Signed-off-by: turuslan <[email protected]>
1 parent 6850899 commit e7619d1

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

.github/workflows/ci.yml

+7-11
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,14 @@ jobs:
1515
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
1616
- name: install
1717
run: |
18-
python3 -m venv ~/venv
19-
source ~/venv/bin/activate
20-
sudo python3 -m pip install --upgrade pip
21-
sudo python3 -m pip install scikit-build
22-
sudo python3 -m pip install cmake==3.25 requests gitpython gcovr
18+
python3 -m pip install --upgrade pip
19+
python3 -m pip install scikit-build
20+
python3 -m pip install cmake==3.25 requests gitpython gcovr
2321
brew install ninja
2422
- name: cmake
2523
env:
2624
CURL_SSL_BACKEND: SecureTransport
27-
run: |
28-
source ~/venv/bin/activate
29-
cmake -G Ninja -B build .
25+
run: cmake -G Ninja -B build .
3026
- name: build
3127
run: cmake --build build -- -j4
3228
- name: test
@@ -47,15 +43,15 @@ jobs:
4743
"cxx": "clang++"
4844
}]
4945
steps:
46+
- name: venv
47+
run: ./housekeeping/github_venv.sh
5048
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
5149
- name: cmake
5250
env:
5351
CC: ${{ matrix.compiler.cc }}
5452
CXX: ${{ matrix.compiler.cxx }}
5553
shell: bash
56-
run: |
57-
source /venv/bin/activate
58-
cmake -B build .
54+
run: cmake -B build .
5955
- name: build
6056
run: cmake --build build -- -j4
6157
- name: test

.github/workflows/clang-tidy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
shell: bash
2626
run: |
2727
source /venv/bin/activate
28-
cmake -G Ninja -B $BUILD_DIR .
28+
cmake -B $BUILD_DIR .
2929
cmake --build $BUILD_DIR --target generated
3030
./housekeeping/clang-tidy-diff.sh
3131

housekeeping/github_venv.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#
2+
# Copyright Quadrivium LLC
3+
# All Rights Reserved
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
7+
GITHUB_ENV="${GITHUB_ENV:?}"
8+
export VIRTUAL_ENV="${1:?venv path not set}"
9+
export PATH="$VIRTUAL_ENV/bin:$PATH"
10+
echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> "$GITHUB_ENV"
11+
echo "PATH=$PATH" >> "$GITHUB_ENV"

0 commit comments

Comments
 (0)