|
50 | 50 | cling-version: '1.0'
|
51 | 51 | cppyy: On
|
52 | 52 | coverage: true
|
53 |
| - #FIXME: Windows CppInterOp tests expected to fail |
54 |
| - #until https://github.com/compiler-research/CppInterOp/issues/188 is solved |
55 | 53 | - name: win2022-msvc-clang-repl-18
|
56 | 54 | os: windows-2022
|
57 | 55 | compiler: msvc
|
@@ -132,10 +130,16 @@ jobs:
|
132 | 130 | - uses: actions/checkout@v4
|
133 | 131 | with:
|
134 | 132 | fetch-depth: 0
|
135 |
| - - name: Set up Python |
| 133 | + |
| 134 | + - name: Set up Python |
136 | 135 | uses: actions/setup-python@v5
|
137 | 136 | with:
|
138 | 137 | 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 |
139 | 143 |
|
140 | 144 | - name: Save PR Info on Unix systems
|
141 | 145 | if: ${{ runner.os != 'windows' }}
|
@@ -292,6 +296,7 @@ jobs:
|
292 | 296 | if: runner.os == 'macOS'
|
293 | 297 | run: |
|
294 | 298 | brew update
|
| 299 | + |
295 | 300 | # workaround for https://github.com/actions/setup-python/issues/577
|
296 | 301 | for pkg in $(brew list | grep '^python@'); do
|
297 | 302 | brew unlink "$pkg"
|
@@ -460,7 +465,7 @@ jobs:
|
460 | 465 | ${{ matrix.cling=='On' && 'cling' || '' }}
|
461 | 466 | key: ${{ steps.cache.outputs.cache-primary-key }}
|
462 | 467 |
|
463 |
| - cppyy_and_xeus_clang_repl: |
| 468 | + cppinterop_and_cppyy_build: |
464 | 469 | needs: [build_cache]
|
465 | 470 | name: ${{ matrix.name }}
|
466 | 471 | runs-on: ${{ matrix.os }}
|
@@ -497,34 +502,6 @@ jobs:
|
497 | 502 | cling-version: '1.0'
|
498 | 503 | cppyy: On
|
499 | 504 | 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 |
528 | 505 | #FIXME: Windows CppInterOp tests expected to fail
|
529 | 506 | #until https://github.com/compiler-research/CppInterOp/issues/188 is solved
|
530 | 507 | - name: win2022-msvc-clang-repl-18
|
@@ -626,10 +603,16 @@ jobs:
|
626 | 603 | - uses: actions/checkout@v4
|
627 | 604 | with:
|
628 | 605 | fetch-depth: 0
|
629 |
| - - name: Set up Python |
| 606 | + |
| 607 | + - name: Set up Python |
630 | 608 | uses: actions/setup-python@v5
|
631 | 609 | with:
|
632 | 610 | 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 |
633 | 616 |
|
634 | 617 | - name: Save PR Info on Unix systems
|
635 | 618 | if: ${{ runner.os != 'windows' }}
|
@@ -786,6 +769,7 @@ jobs:
|
786 | 769 | if: runner.os == 'macOS'
|
787 | 770 | run: |
|
788 | 771 | brew update
|
| 772 | + |
789 | 773 | # workaround for https://github.com/actions/setup-python/issues/577
|
790 | 774 | for pkg in $(brew list | grep '^python@'); do
|
791 | 775 | brew unlink "$pkg"
|
@@ -996,7 +980,7 @@ jobs:
|
996 | 980 | # We need PYTHONPATH later
|
997 | 981 | echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV
|
998 | 982 | - 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') }} |
1000 | 984 | run: |
|
1001 | 985 | # Run the tests
|
1002 | 986 | source .venv/bin/activate
|
@@ -1094,7 +1078,7 @@ jobs:
|
1094 | 1078 | timeout-minutes: 30
|
1095 | 1079 |
|
1096 | 1080 | emscripten_wasm:
|
1097 |
| - needs: [cppyy_and_xeus_clang_repl] |
| 1081 | + needs: [cppinterop_and_cppyy_build] |
1098 | 1082 | name: ${{ matrix.name }}
|
1099 | 1083 | runs-on: ${{ matrix.os }}
|
1100 | 1084 | strategy:
|
@@ -1169,10 +1153,16 @@ jobs:
|
1169 | 1153 | - uses: actions/checkout@v4
|
1170 | 1154 | with:
|
1171 | 1155 | fetch-depth: 0
|
1172 |
| - - name: Set up Python |
| 1156 | + |
| 1157 | + - name: Set up Python |
1173 | 1158 | uses: actions/setup-python@v5
|
1174 | 1159 | with:
|
1175 | 1160 | 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 |
1176 | 1166 |
|
1177 | 1167 | - name: Save PR Info on Unix systems
|
1178 | 1168 | if: ${{ runner.os != 'windows' }}
|
|
0 commit comments