Skip to content

Commit 5ddb9e9

Browse files
committed
CI: Update macOS to use MacOS 14 (x64) and MacOS 15(Arm64)
1 parent db623d3 commit 5ddb9e9

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
os:
21-
- macos-13
2221
- macos-14
22+
- macos-15
2323
include:
24-
- os: macos-13
25-
preset: ci-macos-x64
2624
- os: macos-14
2725
preset: ci-macos-arm64
26+
- os: macos-15
27+
preset: ci-macos-arm64
2828
runs-on: ${{matrix.os}}
2929
steps:
3030
- name: Checkout

src/SimplnxReview/SimplnxReviewLegacyUUIDMapping.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <nlohmann/json.hpp>
66

7-
// clang-format off
7+
/* clang-format off */
88
#include "SimplnxReview/Filters/GroupMicroTextureRegionsFilter.hpp"
99
#include "SimplnxReview/Filters/MergeColoniesFilter.hpp"
1010
#include "SimplnxReview/Filters/ComputeSaltykovSizesFilter.hpp"
@@ -32,4 +32,4 @@ namespace nx::core
3232
};
3333

3434
} // namespace nx::core
35-
// clang-format on
35+
/* clang-format on */

0 commit comments

Comments
 (0)