diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-02-20 05:48:51 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-02-20 05:48:51 +0000 |
| commit | 04807d52596584641d2899d0e5f5f19cda087c50 (patch) | |
| tree | a4cadae101d5e0d82ae364b48dc068f062944b3d /BuildTools/Scripts | |
| parent | iOS travis build: removed xcpretty to understand why the build fails (diff) | |
| download | DiligentCore-04807d52596584641d2899d0e5f5f19cda087c50.tar.gz DiligentCore-04807d52596584641d2899d0e5f5f19cda087c50.zip | |
Another attempt to fix code signing build problem on travis
Diffstat (limited to 'BuildTools/Scripts')
| -rwxr-xr-x | BuildTools/Scripts/travis/build.sh | 6 | ||||
| -rwxr-xr-x | BuildTools/Scripts/travis/build_install.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/BuildTools/Scripts/travis/build.sh b/BuildTools/Scripts/travis/build.sh index bdf0edc8..5f78df11 100755 --- a/BuildTools/Scripts/travis/build.sh +++ b/BuildTools/Scripts/travis/build.sh @@ -11,11 +11,11 @@ fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$IOS" = "true" ]; then cmake .. -DCMAKE_TOOLCHAIN_FILE=../DiligentCore/ios.toolchain.cmake -DIOS_PLATFORM=SIMULATOR64 $1 -G "Xcode" || return - local BUILD_SETTINGS="CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO" + XCODE_BUILD_SETTINGS="CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO" else cmake .. $1 -G "Xcode" || return - local BUILD_SETTINGS="" + XCODE_BUILD_SETTINGS="" fi - xcodebuild -configuration ${CONFIG} ${BUILD_SETTINGS} | xcpretty && return ${PIPESTATUS[0]} + xcodebuild -configuration ${CONFIG} ${XCODE_BUILD_SETTINGS} | xcpretty && return ${PIPESTATUS[0]} fi diff --git a/BuildTools/Scripts/travis/build_install.sh b/BuildTools/Scripts/travis/build_install.sh index 60f73441..783f354b 100755 --- a/BuildTools/Scripts/travis/build_install.sh +++ b/BuildTools/Scripts/travis/build_install.sh @@ -11,10 +11,10 @@ fi if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$IOS" = "true" ]; then cmake .. $1 -DCMAKE_TOOLCHAIN_FILE=../DiligentCore/ios.toolchain.cmake -DIOS_PLATFORM=OS64 -DIOS_ARCH=arm64 -DVULKAN_SDK="$VULKAN_SDK" -DCMAKE_INSTALL_PREFIX=install -G "Xcode" || return - local BUILD_SETTINGS="CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO" + XCODE_BUILD_SETTINGS="CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO" else cmake .. $1 -DCMAKE_INSTALL_PREFIX=install -G "Xcode" || return - local BUILD_SETTINGS="" + XCODE_BUILD_SETTINGS="" fi - xcodebuild -target install -configuration ${CONFIG} ${BUILD_SETTINGS} + xcodebuild -target install -configuration ${CONFIG} ${XCODE_BUILD_SETTINGS} | xcpretty && return ${PIPESTATUS[0]} fi |