Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Улучшение автоматической сборки проектов #99

Merged
merged 46 commits into from
Sep 6, 2017
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
f97d145
Open-Sourced Fastfile & added support for all schemes deliver
Ostrenkiy Aug 24, 2017
39e418b
Automatize screenshots taking for adaptive apps
kvld Aug 24, 2017
bfee2ca
Added all metadata except app_icon for adaptive targets
Ostrenkiy Aug 24, 2017
58db4c8
Merge branch 'feature/fastlane-enhancements' of https://github.com/St…
Ostrenkiy Aug 24, 2017
7e3c924
Updated app_icon files for adaptive targets
Ostrenkiy Aug 24, 2017
643df34
Merge branch 'release/1.41' into feature/fastlane-enhancements
Ostrenkiy Aug 24, 2017
458ccd1
Added schemes info
Ostrenkiy Aug 24, 2017
72dd193
Changed adaptive build numbers
Ostrenkiy Aug 24, 2017
ebff0d2
updated pods info in project file
Ostrenkiy Aug 24, 2017
271f67c
Non-pushing fastlane
Ostrenkiy Aug 24, 2017
3d46caa
removed $(SRCROOT) from plist paths
Ostrenkiy Aug 24, 2017
cc8b4bb
Removed sb srcroot
Ostrenkiy Aug 24, 2017
afdf31a
Added empty lines to demo_user in metadata
Ostrenkiy Aug 24, 2017
80f2b67
Version Bump to 39
Ostrenkiy Aug 24, 2017
48ac819
Removed Fastfile recursion & added back remote support
Ostrenkiy Aug 24, 2017
e267f8a
Added git tags and pushing to remote on beta build
Ostrenkiy Aug 24, 2017
18f856e
Added clean:true to gym
Ostrenkiy Aug 25, 2017
af55204
Added clear derived data before gym now
Ostrenkiy Aug 25, 2017
e4ab3ea
Add missed screenshots schemes
kvld Aug 25, 2017
9e0cf78
Add perfect status bar to screenshots
kvld Aug 25, 2017
bcac299
Fixed subtitle files for builds
Ostrenkiy Aug 25, 2017
59dbe67
Fixed subtitle for 3124
Ostrenkiy Aug 25, 2017
67211b1
Added shared schemes
Ostrenkiy Aug 25, 2017
9499c9a
Removed swiftlint obligatory installation
Ostrenkiy Aug 25, 2017
13de2b6
matching all scheme certificates for both beta and release
Ostrenkiy Aug 25, 2017
f5e3ef8
Removed echo from swiftlint run script
Ostrenkiy Aug 25, 2017
2cbe34c
Renamed run scripts
Ostrenkiy Aug 25, 2017
88bc448
Fixed swiftlint script bug
Ostrenkiy Aug 25, 2017
d46d4e3
Added unlock certificate to fastfile
Ostrenkiy Aug 26, 2017
2b49a3d
Added test for all schemes
Ostrenkiy Aug 26, 2017
7ce75ac
Fixed test lanes naming bug
Ostrenkiy Aug 26, 2017
489d2d6
Added test schemes
Ostrenkiy Aug 26, 2017
a400fc8
Auto upload dSYM for debug
kvld Aug 28, 2017
0d5faa7
Merge branch 'dev' into feature/fastlane-enhancements
Ostrenkiy Aug 30, 2017
13cdb1d
Added slack messages only on failure to scan
Ostrenkiy Sep 1, 2017
86623a9
Add 'customise screenshots' action
kvld Sep 4, 2017
d309a1a
Add screenshots lanes & 1838 resources
kvld Sep 4, 2017
57cc148
Fastfile syntax fix
kvld Sep 4, 2017
7b0f22c
Update adaptive screenshots UI test
kvld Sep 4, 2017
4addfda
Add directory for scripts
kvld Sep 5, 2017
939269a
Add resources for screenshots
kvld Sep 5, 2017
6826f27
Add lanes for version/build update
kvld Sep 5, 2017
2f25367
Format Fastfile
kvld Sep 5, 2017
2db7bd5
Update app descriptions
kvld Sep 5, 2017
e3f4820
Fix swiftlint
kvld Sep 5, 2017
044262b
Merge branch 'dev' into feature/fastlane-enhancements
kvld Sep 5, 2017
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
10 changes: 4 additions & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
Sb/** filter=git-crypt diff=git-crypt
cert/** filter=git-crypt diff=git-crypt
fastlane/Appfile filter=git-crypt diff=git-crypt
fastlane/Fastfile filter=git-crypt diff=git-crypt
fastlane/Deliverfile filter=git-crypt diff=git-crypt
fastlane/Matchfile filter=git-crypt diff=git-crypt
fastlane/metadata/** filter=git-crypt diff=git-crypt
StepicTests/TestInfo.plist filter=git-crypt diff=git-crypt

Stepic/Auth.plist filter=git-crypt diff=git-crypt
Stepic/GoogleService-Info.plist filter=git-crypt diff=git-crypt
Stepic/Tokens.plist filter=git-crypt diff=git-crypt
fastlane/metadata/**/review_information/** filter=git-crypt diff=git-crypt
fastlane/Deliverfile filter=git-crypt diff=git-crypt
fastlane/Appfile filter=git-crypt diff=git-crypt
fastlane/Matchfile filter=git-crypt diff=git-crypt

StepicAdaptiveCourse/Content/**/Auth.plist filter=git-crypt diff=git-crypt
StepicAdaptiveCourse/Content/**/Tokens.plist filter=git-crypt diff=git-crypt
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ DerivedData
#
Pods/
artefacts/
fastlane/screenshots/
#fastlane/screenshots/
fastlane/test_output/
fastlane/report.xml
fastlane/Readme.md
Expand Down
24 changes: 24 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,27 @@ target 'Adaptive 3124' do
adaptive_pods
end

target 'Adaptive 1838 Screenshots' do
pod 'SimulatorStatusMagic', :configurations => ['Debug']
end

target 'Adaptive 1906 Screenshots' do
pod 'SimulatorStatusMagic', :configurations => ['Debug']
end

target 'Adaptive 3067 Screenshots' do
pod 'SimulatorStatusMagic', :configurations => ['Debug']
end

target 'Adaptive 3124 Screenshots' do
pod 'SimulatorStatusMagic', :configurations => ['Debug']
end

target 'Adaptive 3149 Screenshots' do
pod 'SimulatorStatusMagic', :configurations => ['Debug']
end

target 'Adaptive 3150 Screenshots' do
pod 'SimulatorStatusMagic', :configurations => ['Debug']
end

Binary file modified Sb/SberbankUniversity-Info.plist
Binary file not shown.
1,940 changes: 1,862 additions & 78 deletions Stepic.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2CD12B841F4ED1F4001D3C82"
BuildableName = "Adaptive 1838 Screenshots.xctest"
BlueprintName = "Adaptive 1838 Screenshots"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2CD12B841F4ED1F4001D3C82"
BuildableName = "Adaptive 1838 Screenshots.xctest"
BlueprintName = "Adaptive 1838 Screenshots"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2CD12B841F4ED1F4001D3C82"
BuildableName = "Adaptive 1838 Screenshots.xctest"
BlueprintName = "Adaptive 1838 Screenshots"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<LocationScenarioReference
identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
referenceType = "1">
</LocationScenarioReference>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2CD12B841F4ED1F4001D3C82"
BuildableName = "Adaptive 1838 Screenshots.xctest"
BlueprintName = "Adaptive 1838 Screenshots"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
101 changes: 101 additions & 0 deletions Stepic.xcodeproj/xcshareddata/xcschemes/Adaptive 1838.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "86EF29331E83CEA900F8D214"
BuildableName = "Adaptive 1838.app"
BlueprintName = "Adaptive 1838"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2CD12B841F4ED1F4001D3C82"
BuildableName = "Adaptive 1838 Screenshots.xctest"
BlueprintName = "Adaptive 1838 Screenshots"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "86EF29331E83CEA900F8D214"
BuildableName = "Adaptive 1838.app"
BlueprintName = "Adaptive 1838"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "86EF29331E83CEA900F8D214"
BuildableName = "Adaptive 1838.app"
BlueprintName = "Adaptive 1838"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "86EF29331E83CEA900F8D214"
BuildableName = "Adaptive 1838.app"
BlueprintName = "Adaptive 1838"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2CD12BA81F4F34A2001D3C82"
BuildableName = "Adaptive 3067 Screenshots.xctest"
BlueprintName = "Adaptive 3067 Screenshots"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2CD12BA81F4F34A2001D3C82"
BuildableName = "Adaptive 3067 Screenshots.xctest"
BlueprintName = "Adaptive 3067 Screenshots"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2CD12BA81F4F34A2001D3C82"
BuildableName = "Adaptive 3067 Screenshots.xctest"
BlueprintName = "Adaptive 3067 Screenshots"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2CD12BA81F4F34A2001D3C82"
BuildableName = "Adaptive 3067 Screenshots.xctest"
BlueprintName = "Adaptive 3067 Screenshots"
ReferencedContainer = "container:Stepic.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading