SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoapods version (#3903)

Browse Source 
* Installs and uses required cocoapods version.

* Updates circle ci command.

* Moves 'bundle install' into .podinstall target.

* Moves gem install command.

* Downgrades require bundler version.

* Verify/Install cocoapods required version

* Revert changes to cocoapods in ci config

* Always run bundle install for cocoapods

Co-authored-by: Elias Nahum <nahumhbl@gmail.com>
This commit is contained in:
Martin Kraft
2020-02-10 13:33:11 -05:00
committed by GitHub
parent 696d6eef08
commit 168db7ec16
3 changed files with 83 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -7,7 +7,6 @@
.PHONY: build-pr can-build-pr prepare-pr
.PHONY: test help
POD := $(shell which pod 2> /dev/null)
OS := $(shell sh -c 'uname -s 2>/dev/null')
BASE_ASSETS = $(shell find assets/base -type d) $(shell find assets/base -type f -name '*')
OVERRIDE_ASSETS = $(shell find assets/override -type d 2> /dev/null) $(shell find assets/override -type f -name '*' 2> /dev/null)
@@ -33,13 +32,11 @@ npm-ci: package.json
.podinstall:
ifeq ($(OS), Darwin)
ifdef POD
@echo "Required version of Cocoapods is not installed"
@echo Installing gems;
@bundle install
@echo Getting Cocoapods dependencies;
@cd ios && pod install;
else
@echo "Cocoapods is not installed https://cocoapods.org/"
@exit 1
endif
@cd ios && bundle exec pod install;
endif
@touch $@