From a8447657060bd389ec844216aaafcf23507edc5f Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Mon, 29 Aug 2022 14:02:08 +0100
Subject: [PATCH] Update CI scripts
---
.gitlab-ci.yml | 7 +------
run-tests.sh | 21 ++++-----------------
2 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8d0de63..ea48f000 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 19d132d1..fe7c865b 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
--
GitLab