Skip to content

Commit bb4cd5b

Browse files
authored
Upgrade macos-12 runners to macos-13. (#1197)
1 parent d04edb8 commit bb4cd5b

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/cpp-python-build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
strategy:
174174
fail-fast: false
175175
matrix:
176-
os: [ macos-12, ubuntu-22.04, windows-latest ]
176+
os: [ macos-13, ubuntu-22.04, windows-latest ]
177177
runs-on: ${{ matrix.os }}
178178
steps:
179179
- name: Checkout JSBSim
@@ -438,7 +438,7 @@ jobs:
438438
strategy:
439439
fail-fast: false
440440
matrix:
441-
os: [macos-12]
441+
os: [macos-13]
442442
python-version: [3.8]
443443
include:
444444
- os: macos-14
@@ -467,7 +467,7 @@ jobs:
467467
- name: Set up Julia
468468
uses: julia-actions/setup-julia@v2
469469
- name: Install & Configure Doxygen
470-
if: env.release == 'true' && matrix.os == 'macos-12'
470+
if: env.release == 'true' && matrix.os == 'macos-13'
471471
run: |
472472
brew install doxygen
473473
# We don't want Doxygen to generate the HTML docs in this job (saves time)
@@ -496,7 +496,7 @@ jobs:
496496
working-directory: build
497497
run: ctest --parallel $(sysctl -n hw.logicalcpu) --output-on-failure
498498
- name: Build the source package for Python
499-
if: env.release == 'true' && matrix.os == 'macos-12'
499+
if: env.release == 'true' && matrix.os == 'macos-13'
500500
working-directory: build/tests
501501
run: |
502502
echo "::group::Build the type hints stubs"
@@ -522,7 +522,7 @@ jobs:
522522
523523
- name: Upload Files for Release
524524
uses: actions/upload-artifact@v4
525-
if: env.release == 'true' && matrix.os == 'macos-12'
525+
if: env.release == 'true' && matrix.os == 'macos-13'
526526
with:
527527
name: ${{ runner.os }}.binaries
528528
path: |
@@ -585,7 +585,7 @@ jobs:
585585
strategy:
586586
fail-fast: false
587587
matrix:
588-
os: [ubuntu-latest, macos-12, windows-2019]
588+
os: [ubuntu-latest, macos-13, windows-2019]
589589

590590
steps:
591591
- name: Checkout JSBSim
@@ -602,7 +602,7 @@ jobs:
602602
sudo apt-get update
603603
sudo apt-get install doxygen
604604
- name: Install Doxygen (MacOSX)
605-
if: matrix.os == 'macos-12'
605+
if: matrix.os == 'macos-13'
606606
run: brew install doxygen
607607
- name: Install Doxygen (Windows)
608608
if: runner.os == 'Windows'

tests/unit_tests/FGInitialConditionTest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ class FGInitialConditionTest : public CxxTest::TestSuite
137137
TS_ASSERT_DELTA(ic.GetLongitudeDegIC(), lon, epsilon*100.);
138138
TS_ASSERT_DELTA(ic.GetLongitudeRadIC(), lon*M_PI/180., epsilon);
139139
// TS_ASSERT_DELTA(ic.GetAltitudeASLFtIC()/(agl+2000.), 1.0, 2E-8);
140-
// For some reasons, MinGW32, MSVC and M1 MacOS are less accurate than other platforms.
141-
#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__arm64__)
140+
// For some reasons, MinGW32, MSVC and MacOS are less accurate than Linux.
141+
#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__APPLE__)
142142
TS_ASSERT_DELTA(ic.GetAltitudeAGLFtIC()/agl, 1.0, 4E-8);
143143
#else
144144
TS_ASSERT_DELTA(ic.GetAltitudeAGLFtIC()/agl, 1.0, 2E-8);

0 commit comments

Comments
 (0)