Skip to content

Add matrix build for iOS and Mac #554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 29, 2016
Merged

Add matrix build for iOS and Mac #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e3f6c5
Add matrix build for iOS and Mac
pietbrauer Feb 24, 2016
cc3a415
Merge branch 'master' into piet/travis-matrix
pietbrauer Feb 26, 2016
eb64dc4
Remove custom deployment target for tests
pietbrauer Feb 27, 2016
2dc7d72
Revert changes in project file
pietbrauer Feb 29, 2016
de7f644
Use Xcode 7
pietbrauer Feb 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
osx_image: xcode7
language: objective-c
matrix:
include:
- osx_image: xcode7
env: SCHEME="ObjectiveGit Mac"
- osx_image: xcode7
env: SCHEME="ObjectiveGit iOS"
before_install:
- brew update
- brew outdated xctool || brew upgrade xctool
Expand Down
25 changes: 18 additions & 7 deletions script/cibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,19 @@ main ()
"$BOOTSTRAP" || exit $?
fi

echo "*** Prebuilding OpenSSL"
$SCRIPT_DIR/update_libssl_ios
if [ "$SCHEME" == "ObjectiveGit iOS" ]
then
echo "*** Prebuilding OpenSSL"
$SCRIPT_DIR/update_libssl_ios
fi

echo "*** The following schemes will be built:"
echo "$SCHEMES" | xargs -n 1 echo " "
echo
if [ -z "${SCHEME+x}" ] && [ "${#SCHEME[@]}" = 0 ]
then
echo "*** The following schemes will be built:"
echo "$SCHEMES" | xargs -n 1 echo " "
echo

echo "$SCHEMES" | xargs -n 1 | (
echo "$SCHEMES" | xargs -n 1 | (
local status=0

while read scheme
Expand All @@ -78,7 +83,13 @@ main ()
done

exit $status
)
)
else
echo "*** The following scheme will be built $SCHEME"
local status=0
build_scheme "$SCHEME" || status=1
exit $status
fi
}

find_pattern ()
Expand Down