Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d78a48c
Add file to kick off Travis
Dec 16, 2016
5e57770
Checking Travis CI's installed Xcode and simulator devices.
ajsecord Dec 27, 2016
bd3b762
Merge branch 'develop' into testtravis
ajsecord Dec 27, 2016
989261b
Adding Cocoapods init to Travis CI config.
ajsecord Dec 27, 2016
49aa7ac
Enabling building in Travis CI config.
ajsecord Dec 27, 2016
d4e4a5c
Added temporary dumping of the log file on error.
ajsecord Dec 27, 2016
20b755f
Switched Shrine to manual signing.
ajsecord Dec 27, 2016
629294c
Dump Travis code signing options.
ajsecord Dec 27, 2016
94005bf
Adding CocoaPods version to debug output.
ajsecord Dec 27, 2016
794e783
Remove code signing reporting from Travis CI config.
ajsecord Dec 27, 2016
c5bb331
Forcing `build_all` to skip code signing.
ajsecord Dec 27, 2016
0df69c2
Switching Shrine back to automatic provisioning style.
ajsecord Dec 27, 2016
7395bda
Re-enabling testing in Travis CI.
ajsecord Dec 27, 2016
4846c68
Bump up verbosity of testing.
ajsecord Dec 27, 2016
3dbbc2c
Changing test device from 10.2 to 10.1 to work around Travis CI bug.
ajsecord Dec 27, 2016
8192dbc
Remove the printing of available devices, Xcode will print them out o…
ajsecord Dec 27, 2016
49ef16d
Added more context on failure for Travis CI builds only.
ajsecord Dec 27, 2016
95f4710
Re-enable CI for our normal branches.
ajsecord Dec 27, 2016
9688c39
Remove "do not merge" file.
ajsecord Dec 27, 2016
faab394
Removing our development team and switching Catalog to automatic prof…
ajsecord Dec 27, 2016
bfa4502
Removing our development team and switching Bare to automatic profiles.
ajsecord Dec 27, 2016
a5babc3
Removing our development team and switching Pesto to automatic profiles.
ajsecord Dec 27, 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
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,22 @@ sudo: false
# Only fire off builds for specific branches.
branches:
only:
- testtravis
- develop
- stable
- /^feature-.*$/
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
matrix:
- DESTINATION="OS=9.3,name=iPhone 6s" SDK=iphonesimulator9.3
- DESTINATION="platform=iOS Simulator,name=iPhone 7,OS=10.2" SDK="iphonesimulator10.2"
before_install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
script:
- set -o pipefail
- xcodebuild -version
- xcodebuild -showsdks
- pod --version
- scripts/release/manage_pods.py install
- scripts/build_all
- scripts/test_all
20 changes: 14 additions & 6 deletions catalog/MDCCatalog.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -379,18 +379,18 @@
TargetAttributes = {
0B50E1981D91B0BD00DED250 = {
CreatedOnToolsVersion = 7.3.1;
ProvisioningStyle = Automatic;
TestTargetID = 664524B21C6BA62A001ADBF8;
};
64307B371DF74FEF004AE4AC = {
CreatedOnToolsVersion = 8.2;
DevelopmentTeam = EQHXZ8M8AV;
LastSwiftMigration = 0810;
ProvisioningStyle = Automatic;
};
664524B21C6BA62A001ADBF8 = {
CreatedOnToolsVersion = 7.3;
DevelopmentTeam = EQHXZ8M8AV;
LastSwiftMigration = 0810;
ProvisioningStyle = Automatic;
};
};
};
Expand Down Expand Up @@ -715,6 +715,8 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ANALYZER_NONNULL = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = MDCInteractionTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -730,6 +732,8 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CLANG_ANALYZER_NONNULL = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = MDCInteractionTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -748,7 +752,8 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = MDCActionExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.google.mdc-catalog.MDCActionExtension";
Expand All @@ -767,7 +772,8 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = MDCActionExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.google.mdc-catalog.MDCActionExtension";
Expand Down Expand Up @@ -867,7 +873,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = MDCCatalog/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCCatalog;
Expand All @@ -885,7 +892,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = MDCCatalog/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.MDCCatalog;
Expand Down
8 changes: 5 additions & 3 deletions demos/Bare/Bare.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
TargetAttributes = {
20AA6A9B1D4A5D0C0062273A = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = EQHXZ8M8AV;
ProvisioningStyle = Automatic;
};
};
};
Expand Down Expand Up @@ -342,7 +342,8 @@
baseConfigurationReference = 446F2F1AECCCB052B6006DEA /* Pods-Bare.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Bare/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.MaterialComponents.Bare;
Expand All @@ -355,7 +356,8 @@
baseConfigurationReference = ED9C9E04E226DD8974E12F27 /* Pods-Bare.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Bare/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.google.MaterialComponents.Bare;
Expand Down
8 changes: 5 additions & 3 deletions demos/Pesto/Pesto.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
TargetAttributes = {
DEBEDF231C3EF5D5004B614B = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = EQHXZ8M8AV;
ProvisioningStyle = Automatic;
};
};
};
Expand Down Expand Up @@ -449,7 +449,8 @@
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
"GCC_WARN_64_TO_32_BIT_CONVERSION[arch=*64]" = NO;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
Expand Down Expand Up @@ -479,7 +480,8 @@
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
"GCC_WARN_64_TO_32_BIT_CONVERSION[arch=*64]" = NO;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
Expand Down
12 changes: 7 additions & 5 deletions demos/Shrine/Shrine.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@
TargetAttributes = {
DE5D2A431C81068100C9C650 = {
CreatedOnToolsVersion = 7.2;
DevelopmentTeam = EQHXZ8M8AV;
LastSwiftMigration = 0800;
ProvisioningStyle = Automatic;
};
};
};
Expand Down Expand Up @@ -300,7 +300,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -347,7 +347,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
Expand Down Expand Up @@ -375,7 +375,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Shrine/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = google.com.Shrine;
Expand All @@ -392,7 +393,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = EQHXZ8M8AV;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Shrine/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = google.com.Shrine;
Expand Down
9 changes: 7 additions & 2 deletions scripts/build_all
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,23 @@ function is_expected_failure() {
# Given a path to an Xcode log file in $1, print a guess at what caused the
# failure.
function guess_failure() {
grep --after-context=2 "The following build commands failed:" "$1"
if [[ $TRAVIS == "true" ]]; then
tail -n 200 "$1"
else
grep --context=20 "The following build commands failed:" "$1"
fi
}

readonly WORKSPACE_SCHEMES=$("$SCRIPTS_DIR"/xcode/list_all_xcode_schemes)
readonly SIGNING_OPTIONS="CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO"
all_builds_ok=1
for workspace_scheme in $WORKSPACE_SCHEMES; do
workspace=$(echo $workspace_scheme | cut -d: -f1)
scheme=$(echo $workspace_scheme | cut -d: -f2)

echo "Building $scheme in $workspace."
log_file=$(dirname "$workspace")/"build_log_for_scheme_${scheme}.txt"
options="-workspace $workspace -scheme $scheme"
options="-workspace $workspace -scheme $scheme $SIGNING_OPTIONS"
if xcodebuild $options $1 >"$log_file" 2>&1 || \
is_expected_failure "$log_file"; then
rm "$log_file"
Expand Down
13 changes: 12 additions & 1 deletion scripts/test_all
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@

readonly SCRIPTS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
readonly ROOT_DIR="$(dirname $SCRIPTS_DIR)"
readonly DESTINATION='platform=iOS Simulator,name=iPhone 7,OS=latest'
readonly DESTINATION='platform=iOS Simulator,name=iPhone 7,OS=10.1'

# Given a path to an Xcode log file in $1, print a guess at what caused the
# failure.
function guess_failure() {
if [[ $TRAVIS == "true" ]]; then
tail -n 200 "$1"
else
grep --context=20 "The following build commands failed:" "$1"
fi
}

readonly WORKSPACE_SCHEMES=$("$SCRIPTS_DIR"/xcode/list_all_xcode_schemes)
all_tests_ok=1
Expand All @@ -36,6 +46,7 @@ for workspace_scheme in $WORKSPACE_SCHEMES; do
all_tests_ok=0
echo
echo "Failed to test $scheme in $workspace."
guess_failure "$log_file"
echo "Log left in $log_file."
echo "Continuing with next test..."
echo
Expand Down