summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2023-04-18 14:43:04 -0700
committerBrad Linden <brad@lindenlab.com>2023-05-03 14:59:53 -0700
commit9096c8d06fa8f8107870c3beafc7838277b63f2e (patch)
treea1b0301764c707c787081a1785577e3db59332be
parentb985a699684ce991d0a79c8a56fbbd82a4409fec (diff)
Experiment with turning on MacOS builds for github based nightly builds for DRTVWR-559
-rw-r--r--.github/workflows/build.yaml2
-rw-r--r--indra/cmake/LLAddBuildTest.cmake14
2 files changed, 15 insertions, 1 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a110c018ec..0d196132e4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -11,7 +11,7 @@ jobs:
build:
strategy:
matrix:
- runner: [windows-large]
+ runner: [windows-large, macos-12]
configuration: [ReleaseOS]
addrsize: [64]
include:
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index bf569e5d99..405128d661 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -126,6 +126,13 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
message("LL_ADD_PROJECT_UNIT_TESTS ${name}_test_additional_CFLAGS ${${name}_test_additional_CFLAGS}")
endif()
+ if (DARWIN)
+ # test binaries always need to be signed for local development
+ set_target_properties(PROJECT_${project}_TEST_${name}
+ PROPERTIES
+ XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
+ endif ()
+
#
# Setup test targets
#
@@ -221,6 +228,13 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
)
endif ()
+ if (DARWIN)
+ # test binaries always need to be signed for local development
+ set_target_properties(INTEGRATION_TEST_${testname}
+ PROPERTIES
+ XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
+ endif ()
+
# Add link deps to the executable
if(TEST_DEBUG)
message(STATUS "TARGET_LINK_LIBRARIES(INTEGRATION_TEST_${testname} ${libraries})")