|
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,21 @@ 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 Unix Systems |
| 135 | + uses: actions/setup-python@v5 |
| 136 | + with: |
| 137 | + python-version: '3.10' |
| 138 | + |
| 139 | + - name: Set up Python Unix Systems |
136 | 140 | uses: actions/setup-python@v5 |
137 | 141 | with: |
138 | 142 | 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 |
139 | 148 |
|
140 | 149 | - name: Save PR Info on Unix systems |
141 | 150 | if: ${{ runner.os != 'windows' }} |
@@ -292,6 +301,7 @@ jobs: |
292 | 301 | if: runner.os == 'macOS' |
293 | 302 | run: | |
294 | 303 | brew update |
| 304 | + |
295 | 305 | # workaround for https://github.com/actions/setup-python/issues/577 |
296 | 306 | for pkg in $(brew list | grep '^python@'); do |
297 | 307 | brew unlink "$pkg" |
@@ -460,7 +470,7 @@ jobs: |
460 | 470 | ${{ matrix.cling=='On' && 'cling' || '' }} |
461 | 471 | key: ${{ steps.cache.outputs.cache-primary-key }} |
462 | 472 |
|
463 | | - cppyy_and_xeus_clang_repl: |
| 473 | + cppinterop_and_cppyy_build: |
464 | 474 | needs: [build_cache] |
465 | 475 | name: ${{ matrix.name }} |
466 | 476 | runs-on: ${{ matrix.os }} |
@@ -497,34 +507,6 @@ jobs: |
497 | 507 | cling-version: '1.0' |
498 | 508 | cppyy: On |
499 | 509 | 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 | 510 | #FIXME: Windows CppInterOp tests expected to fail |
529 | 511 | #until https://github.com/compiler-research/CppInterOp/issues/188 is solved |
530 | 512 | - name: win2022-msvc-clang-repl-18 |
@@ -626,10 +608,16 @@ jobs: |
626 | 608 | - uses: actions/checkout@v4 |
627 | 609 | with: |
628 | 610 | fetch-depth: 0 |
629 | | - - name: Set up Python |
| 611 | + |
| 612 | + - name: Set up Python Unix Systems |
630 | 613 | uses: actions/setup-python@v5 |
631 | 614 | with: |
632 | 615 | 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 |
633 | 621 |
|
634 | 622 | - name: Save PR Info on Unix systems |
635 | 623 | if: ${{ runner.os != 'windows' }} |
@@ -786,6 +774,7 @@ jobs: |
786 | 774 | if: runner.os == 'macOS' |
787 | 775 | run: | |
788 | 776 | brew update |
| 777 | + |
789 | 778 | # workaround for https://github.com/actions/setup-python/issues/577 |
790 | 779 | for pkg in $(brew list | grep '^python@'); do |
791 | 780 | brew unlink "$pkg" |
@@ -996,7 +985,7 @@ jobs: |
996 | 985 | # We need PYTHONPATH later |
997 | 986 | echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV |
998 | 987 | - 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') }} |
1000 | 989 | run: | |
1001 | 990 | # Run the tests |
1002 | 991 | source .venv/bin/activate |
@@ -1094,7 +1083,7 @@ jobs: |
1094 | 1083 | timeout-minutes: 30 |
1095 | 1084 |
|
1096 | 1085 | emscripten_wasm: |
1097 | | - needs: [cppyy_and_xeus_clang_repl] |
| 1086 | + needs: [cppinterop_and_cppyy_build] |
1098 | 1087 | name: ${{ matrix.name }} |
1099 | 1088 | runs-on: ${{ matrix.os }} |
1100 | 1089 | strategy: |
@@ -1169,10 +1158,16 @@ jobs: |
1169 | 1158 | - uses: actions/checkout@v4 |
1170 | 1159 | with: |
1171 | 1160 | fetch-depth: 0 |
1172 | | - - name: Set up Python |
| 1161 | + |
| 1162 | + - name: Set up Python Unix Systems |
1173 | 1163 | uses: actions/setup-python@v5 |
1174 | 1164 | with: |
1175 | 1165 | 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 |
1176 | 1171 |
|
1177 | 1172 | - name: Save PR Info on Unix systems |
1178 | 1173 | if: ${{ runner.os != 'windows' }} |
|
0 commit comments