feat: iOS add directories-to-pull #1266

adamfilipow92 · 2020-10-23T13:41:44Z

Fixes #1198

Test Plan

How do we know the code works?

Can set directories-to-pull in iOS

Checklist

Unit tested

piotradamczyk5 · 2020-10-23T14:32:34Z

test_runner/src/main/kotlin/ftl/config/common/CommonGcloudConfig.kt

+            "/sdcard or /data/local/tmp (for example, --directories-to-pull /sdcard/tempDir1,/data/local/tmp/tempDir2). " +
+            "Path names are restricted to the characters a-zA-Z0-9_-./+. The paths /sdcard and /data will be made available " +
+            "and treated as implicit path substitutions. E.g. if /sdcard on a particular device does not map to external " +
+            "storage, the system will replace it with the external storage path prefix for that device."]


This is description for Android, not for common. Try to make it more generic

is this a copy pasted description? if it is it should most likely be left as is.

This is a description from android. I moved this property from android to common so now this description should have information for android and ios.

piotradamczyk5 · 2020-10-23T14:33:28Z

please update docs/index.md and flank.ios.yml

codecov-io · 2020-10-26T05:16:10Z

Codecov Report

Merging #1266 into master will increase coverage by 0.01%.
The diff coverage is 53.33%.

@@             Coverage Diff              @@
##             master    #1266      +/-   ##
============================================
+ Coverage     79.65%   79.67%   +0.01%     
  Complexity      724      724              
============================================
  Files           235      235              
  Lines          4498     4501       +3     
  Branches        773      773              
============================================
+ Hits           3583     3586       +3     
  Misses          515      515              
  Partials        400      400

pawelpasterz · 2020-10-26T05:34:54Z

Do we have any working example to verify if this feature is working?
If our current test iOS app is enough please add a detailed/descriptive test plan

pawelpasterz · 2020-10-26T05:37:00Z

test_runner/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt

@@ -62,6 +63,7 @@ object GcIosTestMatrix {

        val iOSTestSetup = IosTestSetup()
            .setNetworkProfile(args.networkProfile)
+            .setPullDirectories(args.directoriesToPull.toIosDeviceFiles())


Interesting, for android we pass a list of strings... and the field itself is named differently directoriesToPull 😸

google API is full of surprises

pawelpasterz · 2020-10-26T05:39:49Z

I can see it's a rather simple change but I will feel more comfortable if I could test it.

adamfilipow92 · 2020-10-26T11:46:57Z

please update docs/index.md and flank.ios.yml

Thanks, changed

piotradamczyk5 · 2020-10-26T17:25:37Z

@Mergifyio rebase

mergify · 2020-10-26T17:26:50Z

Command rebase: failure

Branch rebase failed
First, rewinding head to replay your work on top of it...
Applying: Moved directories to pull to CommonArgs, added tests
.git/rebase-apply/patch:72: trailing whitespace.

warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt
M test_runner/src/main/kotlin/ftl/args/CommonArgs.kt
M test_runner/src/main/kotlin/ftl/args/CreateAndroidArgs.kt
M test_runner/src/main/kotlin/ftl/args/CreateCommonArgs.kt
M test_runner/src/main/kotlin/ftl/args/IArgs.kt
M test_runner/src/main/kotlin/ftl/args/IosArgs.kt
M test_runner/src/main/kotlin/ftl/config/android/AndroidGcloudConfig.kt
M test_runner/src/main/kotlin/ftl/config/common/CommonGcloudConfig.kt
M test_runner/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt
M test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt
M test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosRunCommandTest.kt
M test_runner/src/test/kotlin/ftl/gc/GcIosTestMatrixTest.kt
Falling back to patching base and 3-way merge...
Auto-merging test_runner/src/test/kotlin/ftl/gc/GcIosTestMatrixTest.kt
CONFLICT (content): Merge conflict in test_runner/src/test/kotlin/ftl/gc/GcIosTestMatrixTest.kt
Auto-merging test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosRunCommandTest.kt
Auto-merging test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt
CONFLICT (content): Merge conflict in test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt
Auto-merging test_runner/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt
CONFLICT (content): Merge conflict in test_runner/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt
Auto-merging test_runner/src/main/kotlin/ftl/config/common/CommonGcloudConfig.kt
CONFLICT (content): Merge conflict in test_runner/src/main/kotlin/ftl/config/common/CommonGcloudConfig.kt
Auto-merging test_runner/src/main/kotlin/ftl/config/android/AndroidGcloudConfig.kt
CONFLICT (content): Merge conflict in test_runner/src/main/kotlin/ftl/config/android/AndroidGcloudConfig.kt
Auto-merging test_runner/src/main/kotlin/ftl/args/IosArgs.kt
CONFLICT (content): Merge conflict in test_runner/src/main/kotlin/ftl/args/IosArgs.kt
Auto-merging test_runner/src/main/kotlin/ftl/args/IArgs.kt
CONFLICT (content): Merge conflict in test_runner/src/main/kotlin/ftl/args/IArgs.kt
Auto-merging test_runner/src/main/kotlin/ftl/args/CreateCommonArgs.kt
CONFLICT (content): Merge conflict in test_runner/src/main/kotlin/ftl/args/CreateCommonArgs.kt
Auto-merging test_runner/src/main/kotlin/ftl/args/CreateAndroidArgs.kt
Auto-merging test_runner/src/main/kotlin/ftl/args/CommonArgs.kt
CONFLICT (content): Merge conflict in test_runner/src/main/kotlin/ftl/args/CommonArgs.kt
Auto-merging test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt
error: Failed to merge in the changes.
Patch failed at 0001 Moved directories to pull to CommonArgs, added tests
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

err-code: 53A23

github-actions · 2020-10-30T12:19:11Z

Timestamp: 2020-11-02 13:11:22
Buildscan url for ubuntu-workflow run 341714181
https://gradle.com/s/jz2tinz6fvmnk

adamfilipow92 self-assigned this Oct 23, 2020

adamfilipow92 added the Tiger 🐯 label Oct 23, 2020

adamfilipow92 assigned piotradamczyk5 Oct 23, 2020

piotradamczyk5 reviewed Oct 23, 2020

View reviewed changes

piotradamczyk5 added iOS New Option Used to track PR with new configuration option (useful when updating fladle) labels Oct 23, 2020

bootstraponline force-pushed the 1198-ios-directories-to-pull branch from 9ed1f1c to a3e0976 Compare October 26, 2020 05:07

pawelpasterz reviewed Oct 26, 2020

View reviewed changes

bootstraponline force-pushed the 1198-ios-directories-to-pull branch from a3e0976 to 8dbfcd2 Compare October 26, 2020 07:31

Sloox approved these changes Oct 26, 2020

View reviewed changes

piotradamczyk5 approved these changes Oct 26, 2020

View reviewed changes

zuziaka approved these changes Oct 27, 2020

View reviewed changes

piotradamczyk5 force-pushed the 1198-ios-directories-to-pull branch from 9c75613 to cb2df6f Compare October 27, 2020 13:23

piotradamczyk5 marked this pull request as draft October 27, 2020 13:25

jan-goral approved these changes Oct 29, 2020

View reviewed changes

piotradamczyk5 force-pushed the 1198-ios-directories-to-pull branch from e0abffa to ee8cc72 Compare October 29, 2020 14:53

adamfilipow92 and others added 6 commits November 2, 2020 13:59

Moved directories to pull to CommonArgs, added tests

0b58631

Fix tests

77b314f

Udpate docs

a799509

Update GcIosTestMatrixTest.kt

f1bcfe0

fix build issues after conflicting rebase

9c85b45

Fix pull directory from ios

36f8f2f

Piotr Adamczyk and others added 3 commits November 2, 2020 14:02

update view controller for flank example

d050c51

Update IArgs.kt

35cb6f5

Update AndroidGcloudConfig.kt

c4cdaa2

piotradamczyk5 force-pushed the 1198-ios-directories-to-pull branch from 3b05bfa to c4cdaa2 Compare November 2, 2020 13:06

piotradamczyk5 marked this pull request as ready for review November 2, 2020 13:14

piotradamczyk5 merged commit 22da7bf into master Nov 2, 2020

piotradamczyk5 deleted the 1198-ios-directories-to-pull branch November 2, 2020 13:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: iOS add directories-to-pull #1266

feat: iOS add directories-to-pull #1266

adamfilipow92 commented Oct 23, 2020

piotradamczyk5 Oct 23, 2020

Sloox Oct 26, 2020

adamfilipow92 Oct 26, 2020

piotradamczyk5 commented Oct 23, 2020

codecov-io commented Oct 26, 2020 •

edited

Loading

pawelpasterz commented Oct 26, 2020

pawelpasterz Oct 26, 2020

pawelpasterz Oct 26, 2020

pawelpasterz commented Oct 26, 2020

adamfilipow92 commented Oct 26, 2020 •

edited

Loading

piotradamczyk5 commented Oct 26, 2020

mergify bot commented Oct 26, 2020

github-actions bot commented Oct 30, 2020 •

edited

Loading

feat: iOS add directories-to-pull #1266

feat: iOS add directories-to-pull #1266

Conversation

adamfilipow92 commented Oct 23, 2020

Test Plan

Checklist

piotradamczyk5 Oct 23, 2020

Choose a reason for hiding this comment

Sloox Oct 26, 2020

Choose a reason for hiding this comment

adamfilipow92 Oct 26, 2020

Choose a reason for hiding this comment

piotradamczyk5 commented Oct 23, 2020

codecov-io commented Oct 26, 2020 • edited Loading

Codecov Report

pawelpasterz commented Oct 26, 2020

pawelpasterz Oct 26, 2020

Choose a reason for hiding this comment

pawelpasterz Oct 26, 2020

Choose a reason for hiding this comment

pawelpasterz commented Oct 26, 2020

adamfilipow92 commented Oct 26, 2020 • edited Loading

piotradamczyk5 commented Oct 26, 2020

mergify bot commented Oct 26, 2020

github-actions bot commented Oct 30, 2020 • edited Loading

codecov-io commented Oct 26, 2020 •

edited

Loading

adamfilipow92 commented Oct 26, 2020 •

edited

Loading

github-actions bot commented Oct 30, 2020 •

edited

Loading