|
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,11 @@ 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 | | - python-version: '3.10' |
| 137 | + python-version: '3.12' |
139 | 138 |
|
140 | 139 | - name: Save PR Info on Unix systems |
141 | 140 | if: ${{ runner.os != 'windows' }} |
@@ -292,6 +291,7 @@ jobs: |
292 | 291 | if: runner.os == 'macOS' |
293 | 292 | run: | |
294 | 293 | brew update |
| 294 | + |
295 | 295 | # workaround for https://github.com/actions/setup-python/issues/577 |
296 | 296 | for pkg in $(brew list | grep '^python@'); do |
297 | 297 | brew unlink "$pkg" |
@@ -460,7 +460,7 @@ jobs: |
460 | 460 | ${{ matrix.cling=='On' && 'cling' || '' }} |
461 | 461 | key: ${{ steps.cache.outputs.cache-primary-key }} |
462 | 462 |
|
463 | | - cppyy_and_xeus_clang_repl: |
| 463 | + cppinterop_and_cppyy_build: |
464 | 464 | needs: [build_cache] |
465 | 465 | name: ${{ matrix.name }} |
466 | 466 | runs-on: ${{ matrix.os }} |
@@ -497,34 +497,6 @@ jobs: |
497 | 497 | cling-version: '1.0' |
498 | 498 | cppyy: On |
499 | 499 | 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 | 500 | #FIXME: Windows CppInterOp tests expected to fail |
529 | 501 | #until https://github.com/compiler-research/CppInterOp/issues/188 is solved |
530 | 502 | - name: win2022-msvc-clang-repl-18 |
@@ -626,10 +598,11 @@ jobs: |
626 | 598 | - uses: actions/checkout@v4 |
627 | 599 | with: |
628 | 600 | fetch-depth: 0 |
629 | | - - name: Set up Python |
| 601 | + |
| 602 | + - name: Set up Python |
630 | 603 | uses: actions/setup-python@v5 |
631 | 604 | with: |
632 | | - python-version: '3.10' |
| 605 | + python-version: '3.12' |
633 | 606 |
|
634 | 607 | - name: Save PR Info on Unix systems |
635 | 608 | if: ${{ runner.os != 'windows' }} |
@@ -786,6 +759,7 @@ jobs: |
786 | 759 | if: runner.os == 'macOS' |
787 | 760 | run: | |
788 | 761 | brew update |
| 762 | + |
789 | 763 | # workaround for https://github.com/actions/setup-python/issues/577 |
790 | 764 | for pkg in $(brew list | grep '^python@'); do |
791 | 765 | brew unlink "$pkg" |
@@ -996,7 +970,7 @@ jobs: |
996 | 970 | # We need PYTHONPATH later |
997 | 971 | echo "PYTHONPATH=$PYTHONPATH" >> $GITHUB_ENV |
998 | 972 | - name: Run the tests on Unix Systems |
999 | | - if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') && (matrix.xeus-clang-repl != 'On') }} |
| 973 | + if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }} |
1000 | 974 | run: | |
1001 | 975 | # Run the tests |
1002 | 976 | source .venv/bin/activate |
@@ -1089,7 +1063,7 @@ jobs: |
1089 | 1063 | timeout-minutes: 30 |
1090 | 1064 |
|
1091 | 1065 | emscripten_wasm: |
1092 | | - needs: [cppyy_and_xeus_clang_repl] |
| 1066 | + needs: [cppinterop_and_cppyy_build] |
1093 | 1067 | name: ${{ matrix.name }} |
1094 | 1068 | runs-on: ${{ matrix.os }} |
1095 | 1069 | strategy: |
@@ -1164,10 +1138,11 @@ jobs: |
1164 | 1138 | - uses: actions/checkout@v4 |
1165 | 1139 | with: |
1166 | 1140 | fetch-depth: 0 |
1167 | | - - name: Set up Python |
| 1141 | + |
| 1142 | + - name: Set up Python |
1168 | 1143 | uses: actions/setup-python@v5 |
1169 | 1144 | with: |
1170 | | - python-version: '3.10' |
| 1145 | + python-version: '3.12' |
1171 | 1146 |
|
1172 | 1147 | - name: Save PR Info on Unix systems |
1173 | 1148 | if: ${{ runner.os != 'windows' }} |
|
0 commit comments