Skip to content
This repository was archived by the owner on Jan 19, 2024. It is now read-only.

Update from origin/master#3

Merged
pgreze merged 138 commits into
masterfrom
pgreze/update-from-origin
Oct 21, 2020
Merged

Update from origin/master#3
pgreze merged 138 commits into
masterfrom
pgreze/update-from-origin

Conversation

@pgreze

@pgreze pgreze commented Oct 21, 2020

Copy link
Copy Markdown
Collaborator

What I did:

git fetch origin
git fetch mercari
git branch -b pgreze/update-from-origin mercari/master
git merge origin/master
vim conflicting.files
git add conflicting.files
git merge --continue
git push mercari

Sloox and others added 30 commits August 17, 2020 18:12
* Inital update of detekt

* Detekt upgrade and yml modifications

* Finialize detekt and some minor code changes

* update release notes
* Added generation of release notes

* added tests

* updated documentation

* Delete next release notes
* fix: failing tests

* Update DumpShardsKtTest.kt
* Generate release notes for GitHub release description

* updated documentation
* Flank#1008 Update mergify configuration to make rebase before merge

* Post a message when Pr bad PR title
* Add pseudocode for flank v20.06.2 poll matrices

* Add pseudocode for flank v20.06.2 matrix finish

* Update table & add conclusions.

* Calculate TestOutcome from environments or steps [DRAFT]

TODO:
* Calculate billable minutes
* Fix tests

* Update implementation

* Fix detect issues

* Fix SavedMatrixTest

* Fix UtilsTest

* Fix MockServer

* Fix MatrixMapTest & SavedMatrixTest

* Update summary_output.md

* Update summary_output.md

* Update release_notes.md

* Adjust implementation for summary result of all devices

* Remove old implementation & clean

* Fix NPE

* Update test_runner/src/main/kotlin/ftl/reports/outcome/TestOutcomeContext.kt

Co-authored-by: piotradamczyk5 <[email protected]>

* CR fixes

* Fix typo
* Fix double negation
* Remove unused `notErrors`

TODO
* map BadMatrixError error to proper error code

* Update release_notes.md

* Make BadMatrixError be properly handled as error code 15

* Fix indention
* Fix DumpShardsKtTest is not calling MockServer
* Fix CreateJUnitTestSuiteKtTest

* Fix nullability

Co-authored-by: piotradamczyk5 <[email protected]>
* Flank#955 Publish to GitHub packages

* updated README.md
* fix: Release notes message at GitHub release

* fixed detekt
* Saved matrix refactor 1.0

* Saved matrix bug fixes 1.0

* Recursion error fix

* Fixed failing tests

* Fixed github flows failing tests

* Further fixes besed on pullrequest comments, Outcomedetails nullability change

* Further fixes besed on pullrequest comments

* More code review comments

* Remove vars from updatedSavedMatrix (Flank#1037)

Co-authored-by: Jan Góral <[email protected]>
* Add androidx size annotations support

* Update size samples to match all annotation generations
* More klint options included and autoformat on gradle check

* AutoFormatted files based on detekt & klint

* Fixes for builds and removal of indentation 8 to 4
* Detekt fix 1.0

* Detekt fixed for annotations on single line
feat: Added options for default time and average time
* Update ExecutionStatusPrinter.kt

* Update ExecutionStatusPrinter.kt

* Update tests

* Update MultiLinePrinterTest.kt

* Update test_runner/src/main/kotlin/ftl/run/status/ExecutionStatusPrinter.kt

Co-authored-by: piotradamczyk5 <[email protected]>

* Update ExecutionStatusPrinter.kt

* Fix, removing lines on terminals different than intelliJ console

* revert changes about printing

* Revert changes of MultipleLinePrinterTest

* Create 993_multiple_identical_lines_printing.md

* Update 993_multiple_identical_lines_printing.md

* Update DumpShardsKtTest.kt

Co-authored-by: piotradamczyk5 <[email protected]>
* feat(output): add test axis value column to summary table

docs(output): update summary table

* Display full device name in outcome table

* Update summary_output.md

* Fix namings
bootstraponline and others added 28 commits October 4, 2020 21:13
* [Automatic PR] Dependencies update

* Fixups

Co-authored-by: pawelpasterz <[email protected]>
Co-authored-by: Pawel Pasterz <[email protected]>
* Allow tests to get output from flank on windows

* Added non wsl windows workflow file

* Update windows-non-wsl-workflow.yml

* Minor fixes for windows build

* Neaten CommandHHelper and add misisng bat file

* Name change

* PR comments 1

* PR comments 2

* Return type removal

* Return type removal #2

Co-authored-by: Michael Wright <[email protected]>
* feat: Added printing missing options

* feat: Added printing missing options

* Remove carriage line

Co-authored-by: Michael Wright <[email protected]>
* Added grant permissions

* Added tests

* fixed spaces

* Added grant permissions

* Added tests

* fixed spaces

* Added documentation

* single line

* Proper single line

* Added defaults and autograntpermissions

* Fix pr comments 2

* negate autogrant

* Fix tests

* Name change

* Fixed tests 2
* Add work in progress implementation

* Update work in progress implementation

* Update work in progress implementation

* Increase flank scripts min heap size for preventing OOM when uploading artifacts zip

* Move DependencyUpdatesTask to gradle root to cover all dependencies

* Expose test artifacts functions as cli commands

* Update test_artifacts.md

* Add resolveArtifacts gradle task

* Remove legacy TestArtifact

* remove unused file

* Fix resolveArtifacts task

* code improvements and fixes

* Fix tests

* CR fixes

* Replace okhttp download with fuel

* Fix symbolic link unit test

* Add env variables to integration tests workflow

* Add env variables to wsl workflow

* Add missing env variables

Co-authored-by: Piotr Adamczyk <[email protected]>
Co-authored-by: piotradamczyk5 <[email protected]>
* [Automatic PR] Dependencies update

* Change kotlin_serialization version

Co-authored-by: pawelpasterz <[email protected]>
Co-authored-by: Pawel Pasterz <[email protected]>
* Add dump shards on run ios/android tests

* Added tests and upload on gcs

* Add ios tests

* Add android test to verify calculation shards is called one

* Add obfuscate option to args and use in testRun

* Update DumpShardsKtTest.kt

* Update CreateIosArgs.kt

* remove unnecessary json

* Update DumpShardsKtTest.kt

* Update GetAndroidMatrixShards.kt

* Cr fixes

* Fix creating empty dump on robo tests

* Update test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt

Co-authored-by: Jan Góral <[email protected]>

Co-authored-by: Jan Góral <[email protected]>
Co-authored-by: piotradamczyk5 <[email protected]>
* Add type

* Finialize the type parameter

* Better unit tests

* Added more assertiveness for the Type

* detekt fixes

* Added tests and fixed erronous ones

* Nicer name outputs
* Add flank website code

* Fix subsections & exit codes table

* Update subsections on index.md

Co-authored-by: piotradamczyk5 <[email protected]>
* Added scenario-labels v1

* Added tests for scenario labels

* Updated documentation
* fix: Fix running flankScripts on Windows

* skip ios test runs on Windows

* fix WSL workflow by setting environment variables
* Added scenario-numbers

* Fix merge bugs and tests

* Added tests

* Fixed invalid test
@pgreze
pgreze merged commit 366c970 into master Oct 21, 2020
@pgreze
pgreze deleted the pgreze/update-from-origin branch October 21, 2020 08:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants