Skip to content

Commit d3b81d8

Browse files
committed
Reduce warnings and errors ci
1 parent 3a80b05 commit d3b81d8

File tree

1 file changed

+26
-36
lines changed

1 file changed

+26
-36
lines changed

.github/workflows/ci.yml

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ jobs:
5050
cling-version: '1.0'
5151
cppyy: On
5252
coverage: true
53-
#FIXME: Windows CppInterOp tests expected to fail
54-
#until https://github.com/compiler-research/CppInterOp/issues/188 is solved
5553
- name: win2022-msvc-clang-repl-18
5654
os: windows-2022
5755
compiler: msvc
@@ -132,10 +130,16 @@ jobs:
132130
- uses: actions/checkout@v4
133131
with:
134132
fetch-depth: 0
135-
- name: Set up Python
133+
134+
- name: Set up Python
136135
uses: actions/setup-python@v5
137136
with:
138137
python-version: '3.10'
138+
139+
- name: Update pip on Unix Systems
140+
if: ${{ runner.os != 'windows' }}
141+
run: |
142+
python3.10 -m pip install --upgrade pip
139143
140144
- name: Save PR Info on Unix systems
141145
if: ${{ runner.os != 'windows' }}
@@ -292,6 +296,7 @@ jobs:
292296
if: runner.os == 'macOS'
293297
run: |
294298
brew update
299+
brew remove [email protected]
295300
# workaround for https://github.com/actions/setup-python/issues/577
296301
for pkg in $(brew list | grep '^python@'); do
297302
brew unlink "$pkg"
@@ -460,7 +465,7 @@ jobs:
460465
${{ matrix.cling=='On' && 'cling' || '' }}
461466
key: ${{ steps.cache.outputs.cache-primary-key }}
462467

463-
cppyy_and_xeus_clang_repl:
468+
cppinterop_and_cppyy_build:
464469
needs: [build_cache]
465470
name: ${{ matrix.name }}
466471
runs-on: ${{ matrix.os }}
@@ -497,34 +502,6 @@ jobs:
497502
cling-version: '1.0'
498503
cppyy: On
499504
coverage: true
500-
#Commented out until Ubuntu on arm Github runner becomes available
501-
#os key to be replaced once known
502-
#- name: ubu22-arm-gcc12-clang-repl-18-cppyy
503-
# os: ubuntu-22.04-arm
504-
# compiler: gcc-12
505-
# clang-runtime: '18'
506-
# cling: Off
507-
# cppyy: On
508-
#- name: ubu22-arm-gcc12-clang-repl-17-cppyy
509-
# os: ubuntu-22.04-arm
510-
# compiler: gcc-12
511-
# clang-runtime: '17'
512-
# cling: Off
513-
# cppyy: On
514-
#- name: ubu22-arm-gcc9-clang-repl-16-cppyy
515-
# os: ubuntu-22.04-arm
516-
# compiler: gcc-9
517-
# clang-runtime: '16'
518-
# cling: Off
519-
# cppyy: On
520-
# coverage: true
521-
#- name: ubu22-arm-gcc9-clang13-cling-cppyy
522-
# os: ubuntu-22.04-arm
523-
# compiler: gcc-9
524-
# clang-runtime: '13'
525-
# cling: On
526-
# cling-version: '1.0'
527-
# cppyy: On
528505
#FIXME: Windows CppInterOp tests expected to fail
529506
#until https://github.com/compiler-research/CppInterOp/issues/188 is solved
530507
- name: win2022-msvc-clang-repl-18
@@ -626,10 +603,16 @@ jobs:
626603
- uses: actions/checkout@v4
627604
with:
628605
fetch-depth: 0
629-
- name: Set up Python
606+
607+
- name: Set up Python
630608
uses: actions/setup-python@v5
631609
with:
632610
python-version: '3.10'
611+
612+
- name: Update pip on Unix Systems
613+
if: ${{ runner.os != 'windows' }}
614+
run: |
615+
python3.10 -m pip install --upgrade pip
633616
634617
- name: Save PR Info on Unix systems
635618
if: ${{ runner.os != 'windows' }}
@@ -786,6 +769,7 @@ jobs:
786769
if: runner.os == 'macOS'
787770
run: |
788771
brew update
772+
brew remove [email protected]
789773
# workaround for https://github.com/actions/setup-python/issues/577
790774
for pkg in $(brew list | grep '^python@'); do
791775
brew unlink "$pkg"
@@ -996,7 +980,7 @@ jobs:
996980
# We need PYTHONPATH later
997981
echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV
998982
- name: Run the tests on Unix Systems
999-
if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') && (matrix.xeus-clang-repl != 'On') }}
983+
if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
1000984
run: |
1001985
# Run the tests
1002986
source .venv/bin/activate
@@ -1094,7 +1078,7 @@ jobs:
10941078
timeout-minutes: 30
10951079

10961080
emscripten_wasm:
1097-
needs: [cppyy_and_xeus_clang_repl]
1081+
needs: [cppinterop_and_cppyy_build]
10981082
name: ${{ matrix.name }}
10991083
runs-on: ${{ matrix.os }}
11001084
strategy:
@@ -1169,10 +1153,16 @@ jobs:
11691153
- uses: actions/checkout@v4
11701154
with:
11711155
fetch-depth: 0
1172-
- name: Set up Python
1156+
1157+
- name: Set up Python
11731158
uses: actions/setup-python@v5
11741159
with:
11751160
python-version: '3.10'
1161+
1162+
- name: Update pip on Unix Systems
1163+
if: ${{ runner.os != 'windows' }}
1164+
run: |
1165+
python3.10 -m pip install --upgrade pip
11761166
11771167
- name: Save PR Info on Unix systems
11781168
if: ${{ runner.os != 'windows' }}

0 commit comments

Comments
 (0)