From 6d765604538584733da5408a56a00d9d77e263b5 Mon Sep 17 00:00:00 2001 From: Delisa Mason Date: Thu, 10 Oct 2019 19:39:53 +0100 Subject: [PATCH] ci: Test against Carthage build --- .gitignore | 1 + .travis.yml | 5 ++++- Makefile | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index eddd7ee87..9af183d69 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ DerivedData Pods Carthage *.idea +features/fixtures/carthage-proj diff --git a/.travis.yml b/.travis.yml index 0c4472629..e832914bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,9 @@ matrix: env: PLATFORM=iOS # Xcode 11+ no longer ships with all device combinations premade before_script: xcrun simctl create "13-xs" "iPhone XS" com.apple.CoreSimulator.SimRuntime.iOS-13-0 - script: make test OS=13.0 DEVICE="iPhone XS" + script: + - make test OS=13.0 DEVICE="iPhone XS" + - make build_carthage - osx_image: xcode10.2 env: PLATFORM=iOS script: @@ -19,6 +21,7 @@ matrix: - make test OS=10.3.1 - make test OS=9.3 - make test OS=9.3 TEST_CONFIGURATION=Release + - make build_carthage after_success: - bash <(curl -s 'https://codecov.io/bash') -Z -J '^Bugsnag$' -X gcov -X coveragepy -X fix -D build - osx_image: xcode10.2 # macos 10.14 diff --git a/Makefile b/Makefile index a204db4b2..0fc9170c7 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,14 @@ build: ## Build the library build_ios_static: ## Build the static library target $(XCODEBUILD) -project iOS/Bugsnag.xcodeproj -scheme BugsnagStatic +build_carthage: ## Build the latest pushed commit with Carthage + @mkdir -p features/fixtures/carthage-proj + @echo 'github "bugsnag/bugsnag-cocoa" "'$(shell git rev-parse HEAD)'"' > features/fixtures/carthage-proj/Cartfile + @cd features/fixtures/carthage-proj && \ + carthage update --platform ios && \ + carthage update --platform tvos && \ + carthage update --platform macos + bump: ## Bump the version numbers to $VERSION ifeq ($(VERSION),) @$(error VERSION is not defined. Run with `make VERSION=number bump`)