@@ -182,15 +182,15 @@ jobs:
182182 strategy :
183183 fail-fast : false
184184 matrix :
185- os : [ macos-13 , ubuntu-22.04, windows-latest ]
185+ os : [ macos-14 , ubuntu-22.04, windows-latest ]
186186 runs-on : ${{ matrix.os }}
187187 steps :
188188 - name : Checkout JSBSim
189189 uses : actions/checkout@v6
190190 - name : Set up Matlab
191191 uses : matlab-actions/setup-matlab@v2
192192 with :
193- release : R2022a
193+ release : R2023b
194194 products : Simulink
195195 - name : Configure JSBSim
196196 run : |
@@ -444,15 +444,7 @@ jobs:
444444 MacOSX :
445445 name : C/C++ build (MacOSX)
446446 needs : [XML-validation, MSIS-validation]
447- strategy :
448- fail-fast : false
449- matrix :
450- os : [macos-13]
451- python-version : [3.9]
452- include :
453- - os : macos-14
454- python-version : ' 3.10'
455- runs-on : ${{ matrix.os }}
447+ runs-on : macos-14
456448 steps :
457449 - name : Checkout JSBSim
458450 uses : actions/checkout@v6
@@ -464,19 +456,19 @@ jobs:
464456 path : |
465457 ~/Library/Caches/pip
466458 build/Testing/Temporary/CTestCostData.txt
467- key : ${{ matrix.os }}-${{ matrix.python-version }} -${{ hashFiles('tests/CMakeLists.txt', 'python/requirements.txt') }}
459+ key : macos14 -${{ hashFiles('tests/CMakeLists.txt', 'python/requirements.txt') }}
468460 - name : Set up Python
469461 uses : actions/setup-python@v6
470462 with :
471- python-version : ${{ matrix.python-version }}
463+ python-version : ' 3.10 '
472464 - name : Install Python packages
473465 run : |
474466 pip install -r python/requirements.txt
475467 pip install build lark
476468 - name : Set up Julia
477469 uses : julia-actions/setup-julia@v2
478470 - name : Install & Configure Doxygen
479- if : env.release == 'true' && matrix.os == 'macos-13'
471+ if : env.release == 'true'
480472 run : |
481473 brew install doxygen
482474 # We don't want Doxygen to generate the HTML docs in this job (saves time)
@@ -505,7 +497,7 @@ jobs:
505497 working-directory : build
506498 run : ctest --parallel $(sysctl -n hw.logicalcpu) --output-on-failure
507499 - name : Build the source package for Python
508- if : env.release == 'true' && matrix.os == 'macos-13'
500+ if : env.release == 'true'
509501 working-directory : build/python
510502 run : |
511503 echo "::group::Generate the type hints stub"
@@ -518,7 +510,6 @@ jobs:
518510 python -m build --sdist
519511 echo "::endgroup::"
520512 - name : Check reset for real time execution
521- if : matrix.os == 'macos-14'
522513 run : |
523514 start_time=$(date +%s)
524515 ./build/src/JSBSim scripts/c172_cruise_8K.xml --realtime --nice
@@ -541,7 +532,7 @@ jobs:
541532
542533 - name : Upload Files for Release
543534 uses : actions/upload-artifact@v5
544- if : env.release == 'true' && matrix.os == 'macos-13'
535+ if : env.release == 'true'
545536 with :
546537 name : ${{ runner.os }}.binaries
547538 path : |
@@ -600,7 +591,7 @@ jobs:
600591 strategy :
601592 fail-fast : false
602593 matrix :
603- os : [ubuntu-latest, macos-13 , windows-2022]
594+ os : [ubuntu-latest, macos-14 , windows-2022]
604595
605596 steps :
606597 - name : Checkout JSBSim
@@ -617,7 +608,7 @@ jobs:
617608 sudo apt-get update
618609 sudo apt-get install doxygen
619610 - name : Install Doxygen (MacOSX)
620- if : matrix.os == 'macos-13 '
611+ if : matrix.os == 'macos-14 '
621612 run : brew install doxygen
622613 - name : Install Doxygen (Windows)
623614 if : runner.os == 'Windows'
0 commit comments