Skip to content

Commit 4982c85

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

File tree

1 file changed

+31
-36
lines changed

1 file changed

+31
-36
lines changed

.github/workflows/ci.yml

Lines changed: 31 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,21 @@ jobs:
132130
- uses: actions/checkout@v4
133131
with:
134132
fetch-depth: 0
135-
- name: Set up Python
133+
134+
- name: Set up Python Unix Systems
135+
uses: actions/setup-python@v5
136+
with:
137+
python-version: '3.10'
138+
139+
- name: Set up Python Unix Systems
136140
uses: actions/setup-python@v5
137141
with:
138142
python-version: '3.10'
143+
144+
- name: Update pip on Unix Systems
145+
if: ${{ runner.os != 'windows' }}
146+
run: |
147+
python3.10 -m pip install --upgrade pip
139148
140149
- name: Save PR Info on Unix systems
141150
if: ${{ runner.os != 'windows' }}
@@ -292,6 +301,7 @@ jobs:
292301
if: runner.os == 'macOS'
293302
run: |
294303
brew update
304+
brew remove [email protected]
295305
# workaround for https://github.com/actions/setup-python/issues/577
296306
for pkg in $(brew list | grep '^python@'); do
297307
brew unlink "$pkg"
@@ -460,7 +470,7 @@ jobs:
460470
${{ matrix.cling=='On' && 'cling' || '' }}
461471
key: ${{ steps.cache.outputs.cache-primary-key }}
462472

463-
cppyy_and_xeus_clang_repl:
473+
cppinterop_and_cppyy_build:
464474
needs: [build_cache]
465475
name: ${{ matrix.name }}
466476
runs-on: ${{ matrix.os }}
@@ -497,34 +507,6 @@ jobs:
497507
cling-version: '1.0'
498508
cppyy: On
499509
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
528510
#FIXME: Windows CppInterOp tests expected to fail
529511
#until https://github.com/compiler-research/CppInterOp/issues/188 is solved
530512
- name: win2022-msvc-clang-repl-18
@@ -626,10 +608,16 @@ jobs:
626608
- uses: actions/checkout@v4
627609
with:
628610
fetch-depth: 0
629-
- name: Set up Python
611+
612+
- name: Set up Python Unix Systems
630613
uses: actions/setup-python@v5
631614
with:
632615
python-version: '3.10'
616+
617+
- name: Update pip on Unix Systems
618+
if: ${{ runner.os != 'windows' }}
619+
run: |
620+
python3.10 -m pip install --upgrade pip
633621
634622
- name: Save PR Info on Unix systems
635623
if: ${{ runner.os != 'windows' }}
@@ -786,6 +774,7 @@ jobs:
786774
if: runner.os == 'macOS'
787775
run: |
788776
brew update
777+
brew remove [email protected]
789778
# workaround for https://github.com/actions/setup-python/issues/577
790779
for pkg in $(brew list | grep '^python@'); do
791780
brew unlink "$pkg"
@@ -996,7 +985,7 @@ jobs:
996985
# We need PYTHONPATH later
997986
echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV
998987
- name: Run the tests on Unix Systems
999-
if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') && (matrix.xeus-clang-repl != 'On') }}
988+
if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
1000989
run: |
1001990
# Run the tests
1002991
source .venv/bin/activate
@@ -1094,7 +1083,7 @@ jobs:
10941083
timeout-minutes: 30
10951084

10961085
emscripten_wasm:
1097-
needs: [cppyy_and_xeus_clang_repl]
1086+
needs: [cppinterop_and_cppyy_build]
10981087
name: ${{ matrix.name }}
10991088
runs-on: ${{ matrix.os }}
11001089
strategy:
@@ -1169,10 +1158,16 @@ jobs:
11691158
- uses: actions/checkout@v4
11701159
with:
11711160
fetch-depth: 0
1172-
- name: Set up Python
1161+
1162+
- name: Set up Python Unix Systems
11731163
uses: actions/setup-python@v5
11741164
with:
11751165
python-version: '3.10'
1166+
1167+
- name: Update pip on Unix Systems
1168+
if: ${{ runner.os != 'windows' }}
1169+
run: |
1170+
python3.10 -m pip install --upgrade pip
11761171
11771172
- name: Save PR Info on Unix systems
11781173
if: ${{ runner.os != 'windows' }}

0 commit comments

Comments
 (0)