Skip to content

Commit

Permalink
fix xcodebuild ci step (flowkey#334)
Browse files Browse the repository at this point in the history
* update xcode on ci

* remove broken test after xcode upgrade

* remove codecov report
  • Loading branch information
michaelknoch authored Jul 19, 2021
1 parent 6f92297 commit 7de7ab0
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 96 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -61,8 +59,6 @@
ReferencedContainer = "container:UIKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
26 changes: 11 additions & 15 deletions UIKit.xcodeproj/xcshareddata/xcschemes/UIKit.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,17 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5C27E7AD1ECB2F6500F5020D"
BuildableName = "UIKit.framework"
BlueprintName = "UIKit"
ReferencedContainer = "container:UIKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -40,17 +49,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5C27E7AD1ECB2F6500F5020D"
BuildableName = "UIKit.framework"
BlueprintName = "UIKit"
ReferencedContainer = "container:UIKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -71,8 +69,6 @@
ReferencedContainer = "container:UIKit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
7 changes: 0 additions & 7 deletions UIKitTests/Button/ButtonSetTitleColorForStateTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ class ButtonSetTitleColorForStateTests: XCTestCase {
button = Button(frame: .zero)
}

func testNoTitleColorWithoutTitleForNormalState() {
button.setTitleColor(.blue, for: .normal)
button.layoutSubviews()

XCTAssertNotEqual(button.titleLabel?.textColor, .blue)
}

func testExistingTitleColorWithTitleForNormalState() {
button.setTitleColor(.blue, for: .normal)
button.setTitle(shortButtonText, for: .normal)
Expand Down
133 changes: 63 additions & 70 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,77 +1,70 @@
jobs:
xcodebuild:
macos:
xcode: "10.1.0"
steps:
- checkout
- run: git submodule update --recursive --init

- run:
name: Test UIKit for macOS
command: set -o pipefail &&
xcodebuild
CODE_SIGNING_REQUIRED=NO
CODE_SIGN_IDENTITY=""
PROVISIONING_PROFILE=""
-sdk "macosx"
-scheme "UIKit"
build test |
xcpretty --color --report junit
xcodebuild:
macos:
xcode: "12.5.0"
steps:
- checkout
- run: git submodule update --recursive --init

- run:
name: "send coverage report to codecov"
command: bash <(curl -s https://codecov.io/bash) -J 'UIKit'
environment:
- CODECOV_TOKEN: "4b6cd237-4637-42d6-ad29-0d1a6ee59761"
- run:
name: Test UIKit for macOS
command: set -o pipefail &&
xcodebuild
CODE_SIGNING_REQUIRED=NO
CODE_SIGN_IDENTITY=""
PROVISIONING_PROFILE=""
-sdk "macosx"
-scheme "UIKit"
build test |
xcpretty --color --report junit

- run:
name: Test iOSTestTarget
command: set -o pipefail &&
xcodebuild
CODE_SIGNING_REQUIRED=NO
CODE_SIGN_IDENTITY=""
PROVISIONING_PROFILE=""
-sdk "iphonesimulator"
-destination 'platform=iOS Simulator,OS=latest,name=iPhone 8 Plus'
-scheme "UIKit iOSTestTarget"
test |
xcpretty --color --report junit
- run:
name: Test iOSTestTarget
command: set -o pipefail &&
xcodebuild
CODE_SIGNING_REQUIRED=NO
CODE_SIGN_IDENTITY=""
PROVISIONING_PROFILE=""
-sdk "iphonesimulator"
-destination 'platform=iOS Simulator,OS=latest,name=iPhone 8 Plus'
-scheme "UIKit iOSTestTarget"
test |
xcpretty --color --report junit

- run:
name: Build demo app for iOS
command: set -o pipefail &&
xcodebuild
CODE_SIGNING_REQUIRED=NO
CODE_SIGN_IDENTITY=""
PROVISIONING_PROFILE=""
-sdk "iphonesimulator"
-destination 'platform=iOS Simulator,OS=latest,name=iPhone 8 Plus'
-scheme "DemoApp"
build |
xcpretty --color --report junit
path: ./samples/getting-started
- run:
name: Build demo app for iOS
command: set -o pipefail &&
xcodebuild
CODE_SIGNING_REQUIRED=NO
CODE_SIGN_IDENTITY=""
PROVISIONING_PROFILE=""
-sdk "iphonesimulator"
-destination 'platform=iOS Simulator,OS=latest,name=iPhone 8 Plus'
-scheme "DemoApp"
build |
xcpretty --color --report junit
path: ./samples/getting-started


gradlebuild:
docker:
- image: flowkey/androidswift5:latest
steps:
- checkout
- run: git submodule update --recursive --init
- restore_cache:
key: gradle_v1-{{ checksum "./samples/getting-started/android/build.gradle" }}
- run:
name: Build demo app for android
command: ./gradlew assembleDebug
path: ./samples/getting-started/android
- save_cache:
key: gradle_v1-{{ checksum "./samples/getting-started/android/build.gradle" }}
paths:
- /root/.gradle/
gradlebuild:
docker:
- image: flowkey/androidswift5:latest
steps:
- checkout
- run: git submodule update --recursive --init
- restore_cache:
key: gradle_v1-{{ checksum "./samples/getting-started/android/build.gradle" }}
- run:
name: Build demo app for android
command: ./gradlew assembleDebug
path: ./samples/getting-started/android
- save_cache:
key: gradle_v1-{{ checksum "./samples/getting-started/android/build.gradle" }}
paths:
- /root/.gradle/

workflows:
version: 2
uikit:
jobs:
- xcodebuild
- gradlebuild
version: 2
uikit:
jobs:
- xcodebuild
- gradlebuild

0 comments on commit 7de7ab0

Please sign in to comment.