diff options
| -rw-r--r-- | .github/workflows/macos.yml | 6 | ||||
| -rw-r--r-- | tests/projects/other/multiplats_xcode/test.lua | 18 |
2 files changed, 20 insertions, 4 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 581e5abf2..0408b90f3 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -33,10 +33,10 @@ jobs: - uses: little-core-labs/[email protected] id: tagName - - name: Installation + - name: Install dlang toolchain run: | - brew install dmd - brew install dub + brew install dmd --HEAD dub + dmd --version - name: Tests run: | diff --git a/tests/projects/other/multiplats_xcode/test.lua b/tests/projects/other/multiplats_xcode/test.lua index 196797077..5d27584e3 100644 --- a/tests/projects/other/multiplats_xcode/test.lua +++ b/tests/projects/other/multiplats_xcode/test.lua @@ -3,6 +3,22 @@ function main(t) os.exec("xmake f -c -vD") os.exec("xmake -rvD") os.exec("xmake f -c -vD -p iphoneos") - os.exec("xmake -rvD") + -- build only arm64 target first, avoid building armv7 if SDK doesn't support it + os.exec("xmake -rvD test_iphoneos") + -- try to build armv7 target, skip if SDK doesn't support it + try + { + function () + os.exec("xmake f -c -vD -p iphoneos -a armv7") + os.exec("xmake -rvD test_iphoneos_armv7") + end, + catch + { + function (errors) + -- SDK doesn't support armv7, skip this target + cprint("${color.warning}skip test_iphoneos_armv7: SDK doesn't support armv7") + end + } + } end end |