Skip to content

Commit 35b3e24

Browse files
authored
use macos 15 and 26 (#459)
1 parent 73317d3 commit 35b3e24

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

File renamed without changes.

.github/config/conan/profiles/macos-13-clang-14 renamed to .github/config/conan/profiles/macos-26-armv8-clang-14

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[settings]
2-
arch=x86_64
2+
arch=armv8
33
build_type=Release
44
compiler=apple-clang
55
compiler.version=14

.github/workflows/build_test.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020
include:
2121
- { os: ubuntu-24.04, build_profile: ubuntu-24.04-clang-18, host_profile: ubuntu-24.04-clang-18 }
2222
- { os: ubuntu-24.04, build_profile: ubuntu-24.04-gcc-14, host_profile: ubuntu-24.04-gcc-14 }
23-
- { os: macos-14, build_profile: macos-14-armv8-clang-14, host_profile: macos-14-armv8-clang-14 }
23+
- { os: macos-15, build_profile: macos-15-armv8-clang-14, host_profile: macos-15-armv8-clang-14 }
24+
- { os: macos-26, build_profile: macos-26-armv8-clang-14, host_profile: macos-26-armv8-clang-14 }
2425
- { os: windows-2022, build_profile: windows-2022-msvc-1940, host_profile: windows-2022-msvc-1940 }
2526
- { os: ubuntu-24.04, build_profile: ubuntu-24.04-clang-18, host_profile: android-35-x86_64, ndk_version: 28.1.13356709 }
2627
steps:
@@ -190,7 +191,7 @@ jobs:
190191
# fails at the moment because of pdf2htmlex
191192
#- { os: ubuntu-24.04, host_profile: ubuntu-24.04-clang-18 }
192193
#- { os: ubuntu-24.04, host_profile: ubuntu-24.04-gcc-14 }
193-
- { os: macos-14, host_profile: macos-14-armv8-clang-14 }
194+
- { os: macos-26, host_profile: macos-26-armv8-clang-14 }
194195
# Windows test disabled because:
195196
# Running main() from C:\Users\runneradmin\.conan2\p\b\gtestdd9407d368b89\b\src\googletest\src\gtest_main.cc
196197
# [ FATAL ] C:/Users/runneradmin/.conan2/p/gtest28fa6787e7f6e/p/include\gtest/internal/gtest-param-util.h(585):: Condition IsValidParamName(param_name) failed. Parameterized test name 'odr_private\docx\03_smpldap_docx' is invalid, in D:\a\OpenDocument.core\OpenDocument.core\test\src\html_output_test.cpp line 129
@@ -274,7 +275,8 @@ jobs:
274275
include:
275276
- { os: ubuntu-24.04, build_profile: ubuntu-24.04-clang-18, host_profile: ubuntu-24.04-clang-18 }
276277
- { os: ubuntu-24.04, build_profile: ubuntu-24.04-gcc-14, host_profile: ubuntu-24.04-gcc-14 }
277-
- { os: macos-14, build_profile: macos-14-armv8-clang-14, host_profile: macos-14-armv8-clang-14 }
278+
- { os: macos-15, build_profile: macos-15-armv8-clang-14, host_profile: macos-15-armv8-clang-14 }
279+
- { os: macos-26, build_profile: macos-26-armv8-clang-14, host_profile: macos-26-armv8-clang-14 }
278280
- { os: windows-2022, build_profile: windows-2022-msvc-1940, host_profile: windows-2022-msvc-1940 }
279281
- { os: ubuntu-24.04, build_profile: ubuntu-24.04-clang-18, host_profile: android-35-x86_64, ndk_version: 28.1.13356709 }
280282
steps:

0 commit comments

Comments
 (0)