Skip to content

Commit 6560bf1

Browse files
committed
last option
1 parent ee4b3fe commit 6560bf1

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

.github/actions/pre-build/action.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ runs:
3131

3232
- name: mount cvmfs
3333
run: |
34-
if [ "${{ matrix.os }}" == "debian10" ]; then
35-
python3 -m pip install --user --ignore-installed -U pip
36-
else
34+
if [ "${{ matrix.os }}" != "debian10" ]; then
3735
apt-get update
3836
apt-get install --fix-missing -y sudo wget gnupg lsb-release
3937
sudo -H pip3 install --ignore-installed -U conan

.github/actions/r3bbuild-steps/action.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ runs:
2626
git config --global --add safe.directory $GITHUB_WORKSPACE
2727
git submodule update --init --recursive
2828
git clone https://github.com/R3BRootGroup/macros.git
29-
if [ "${{ matrix.os }}" == "debian10" ]; then
30-
python3 -m pip install --user --ignore-installed -U pip
31-
python3 -m pip install --user --ignore-installed -U conan
32-
echo "$HOME/.local/bin" >> $GITHUB_PATH
33-
fi
3429
echo ""
3530
echo "path environment variable: $PATH\n"
3631
echo ""

.github/workflows/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ jobs:
147147
# build with conan package manager
148148
- repos: r3broot-conan
149149
preset: default
150+
151+
exclude:
152+
- repos: r3broot-conan
153+
os: debian10
150154

151155
# Jobs are run inside a Docker container, which provides different compiled
152156
# tool-kits for the building, such as clang-tidy and cvmfs. For more

0 commit comments

Comments
 (0)