diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8d0de634763cfbda3cb0da1aa5fe9e5394f40ea..ea48f000a1a5251286403a45c5d724a3c81a998b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,4 @@ tests: tags: - ios script: - - echo -e "section_start:`date +%s`:test_macos\r\e[0KRun tests on macOS" - - ./run-tests.sh macos - - echo -e "section_end:`date +%s`:test_macos\r\e[0K" - - echo -e "section_start:`date +%s`:test_ios\r\e[0KRun tests on iOS Simulator" - - ./run-tests.sh ios - - echo -e "section_end:`date +%s`:test_ios\r\e[0K" + - ./run-tests.sh diff --git a/run-tests.sh b/run-tests.sh index 19d132d17754003c8654bffd3b85ddb4ca85633e..fe7c865b4ef45a85a3994a2d91e8374d213456c9 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -1,21 +1,8 @@ #!/bin/sh set -e -if [ "$1" = "ios" ]; then +echo "\n\033[1;32m▶ Running tests on iOS Simulator...\033[0m" +set -o pipefail && xcodebuild -scheme 'elixxir-dapps-sdk-swift-Package' -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=15.5,name=iPhone 13' test | ./xcbeautify - echo "\n\033[1;32m▶ Running tests on iOS Simulator...\033[0m" - set -o pipefail && xcodebuild -scheme 'elixxir-dapps-sdk-swift-Package' -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=15.5,name=iPhone 13' test | ./xcbeautify - -elif [ "$1" = "macos" ]; then - - echo "\n\033[1;32m▶ Running tests on macOS...\033[0m" - set -o pipefail && swift test 2>&1 | ./xcbeautify - -else - - echo "Invalid option. Usage:" - echo " run-tests.sh ios - Run tests on iOS Simulator" - echo " run-tests.sh macos - Run tests on macOS" - exit 1 - -fi +echo "\n\033[1;32m▶ Running tests on macOS...\033[0m" +set -o pipefail && swift test 2>&1 | ./xcbeautify