diff --git a/.gitignore b/.gitignore index 4046747..aaea0fe 100644 --- a/.gitignore +++ b/.gitignore @@ -51,8 +51,6 @@ Podfile.lock # # Add this line if you want to avoid checking in source code from Carthage dependencies. Carthage/Checkouts -Cartfile.resolved - Carthage/Build # Go Mobile Build results and dependency sources diff --git a/.travis.yml b/.travis.yml index cb77db7..8a3f02b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,26 @@ before_install: install: - gem update fastlane before_script: - - travis_wait 45 carthage bootstrap --platform iOS - - ./gopenpgp_build.sh + - | + if [ ! $(git diff --name-only master..."$TRAVIS_COMMIT" | grep "Carthage.lock") ] && [ -d "Carthage/Build" ]; then + echo "Use cached carthage dependencies." + else + echo "Bootstrap carthage dependencies." + travis_wait 45 carthage bootstrap --platform iOS + fi + - | + if [ ! $(git diff --name-only master..."$TRAVIS_COMMIT" | grep "gopenpgp_build.sh") ] && [ -d "go/dist" ]; then + echo "Use cached go dependencies." + else + echo "Build go dependencies." + ./gopenpgp_build.sh + fi script: - if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_EVENT_TYPE" = "push" ]; then fastlane test && fastlane beta; else fastlane test; fi +cache: + directories: + - Carthage + - go env: global: - secure: NsbIgKZAO1Rhr/QUFsvs5LjOGf4vFIWqCJNr+zhw9DKnOd+G8m1z9wsfNyUhg+v1eUONVMxI/FTeAobnn20kxetw1dMQn4/rL4+IB4UsmODuwcFF7JCUAzEB2Wv82O91nVwT48zEmNyOG2VkgfqOgHeASStQyDPFzJuyXFy+RzoBNKK3X7Uxk19UQI80UmXvW9bmQuY8O37g/qwFj4mnluNvPIvGHry0LPMlbh6fRPsHwXlDmD2FSLoW3GI3PLN1pWsIXLURUr3bioLBJ3E0tzZsFA4AM0xs9Y7Td9f87zo4pRTAH5p2EieSq5IfNS2RDQh5aftrLFBZPUui/86yc9hoceLuOVQKkByBavMBVzfIAiAoJZdBX9cTNDh+zzFs+WZKfP4jYnN1xrFPBmHOG5kVRiA++UbepferDjr80A5aXU3FLjOeuKKrkLvAphGRMwsbx9omYHjAa2eaf2oaLeKLENkl/C/6CeG4D1F/PLsdsjilfHEQKroDRWgxU2Se+bKYucmpBXa8fjWHUyr4pfcgc6qB/R62TxYBI94QSbWAEwE6eEzUlmBoids1l5KTWqnMqXYHlxNXNao2RxV2aqwq5OuWqg1hYBxXVBUKGvzXYONnsxfgcc7NLuTPfeR/h1v7CYcs6VG+z2rYJNY5pBTHrYzeNG0RbDNq3ofMl+M= diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..3067882 --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,7 @@ +github "SVProgressHUD/SVProgressHUD" "2.2.5" +github "kishikawakatsumi/KeychainAccess" "v3.2.0" +github "leonbreedt/FavIcon" "3.0.6" +github "libgit2/objective-git" "0.14.2" +github "mattrubin/Base32" "1.1.2+xcode10.2" +github "mattrubin/OneTimePassword" "3.1.5" +github "radex/SwiftyUserDefaults" "4.0.0"