From d82d72006e93734bf3961fb3e43734dbeb733a0b Mon Sep 17 00:00:00 2001 From: diosmosis Date: Tue, 18 Sep 2018 14:29:22 -0700 Subject: [PATCH 1/7] do not automatically download lfs files when cloning/checking out --- .lfsconfig | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .lfsconfig diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 00000000000..2cf1bce1b17 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + fetchexclude = * From f4579ab7ddf9d04b07b102de781df07c573a0fda Mon Sep 17 00:00:00 2001 From: diosmosis Date: Tue, 18 Sep 2018 14:42:08 -0700 Subject: [PATCH 2/7] Tweak screenshots readme. --- tests/README.screenshots.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/README.screenshots.md b/tests/README.screenshots.md index 2a914c5f642..e8be2c86707 100644 --- a/tests/README.screenshots.md +++ b/tests/README.screenshots.md @@ -45,6 +45,10 @@ _Note: the `tests:sync-ui-screenshots` console command can be used to speed up t ## Running Tests +Before running tests you'll want to pull the screenshots in lfs: + + $ git lfs pull + You can test the UI by running the following command in the root piwik directory: $ ./console tests:run-ui From 0f3f68ff695c1df000c46126964774e467fd3443 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Tue, 18 Sep 2018 19:44:40 -0700 Subject: [PATCH 3/7] Add lfs pull command. --- .travis.yml | 1 + tests/travis | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a9618ccc3bc..e241ba09f44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,6 +86,7 @@ before_install: install: - git fetch -q + - git lfs pull - export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --verbose" - '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh' diff --git a/tests/travis b/tests/travis index e306645ff8f..cc9eadaab7e 160000 --- a/tests/travis +++ b/tests/travis @@ -1 +1 @@ -Subproject commit e306645ff8ff8d9e0b966a14df1f50cc9b7ea99d +Subproject commit cc9eadaab7ee896eb69c716221ab914c730f7717 From a68a9937ef197370892ff582956ffc5c03003c31 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Wed, 19 Sep 2018 22:00:25 -0700 Subject: [PATCH 4/7] Update submodule. --- tests/travis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/travis b/tests/travis index cc9eadaab7e..d54ce7e38b3 160000 --- a/tests/travis +++ b/tests/travis @@ -1 +1 @@ -Subproject commit cc9eadaab7ee896eb69c716221ab914c730f7717 +Subproject commit d54ce7e38b343aaea96a03399fead810a733453f From cbe72b8f88dd9df88698a74540bf288b9140161b Mon Sep 17 00:00:00 2001 From: diosmosis Date: Wed, 19 Sep 2018 22:28:24 -0700 Subject: [PATCH 5/7] Regenerate .travis.yml. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e241ba09f44..a9618ccc3bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,6 @@ before_install: install: - git fetch -q - - git lfs pull - export GENERATE_TRAVIS_YML_COMMAND="php ./tests/travis/generator/main.php generate:travis-yml --core --verbose" - '[[ "$TRAVIS_JOB_NUMBER" != *.1 || "$TRAVIS_PULL_REQUEST" != "false" ]] || ./tests/travis/autoupdate_travis_yml.sh' From fac581f9fcafd97dc1d52532022b25bb88264911 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Thu, 20 Sep 2018 12:48:01 -0700 Subject: [PATCH 6/7] Must use --exclude= in fetch/pull command. --- tests/README.screenshots.md | 4 ++-- tests/travis | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/README.screenshots.md b/tests/README.screenshots.md index e8be2c86707..f020e964bb0 100644 --- a/tests/README.screenshots.md +++ b/tests/README.screenshots.md @@ -45,9 +45,9 @@ _Note: the `tests:sync-ui-screenshots` console command can be used to speed up t ## Running Tests -Before running tests you'll want to pull the screenshots in lfs: +Before running tests you'll want to pull the screenshots in lfs (the `--exclude=` since by default LFS files are excluded from being fetched in .lfsconfig to keep bandwidth usage down): - $ git lfs pull + $ git lfs pull --exclude= You can test the UI by running the following command in the root piwik directory: diff --git a/tests/travis b/tests/travis index d54ce7e38b3..bf73c50892a 160000 --- a/tests/travis +++ b/tests/travis @@ -1 +1 @@ -Subproject commit d54ce7e38b343aaea96a03399fead810a733453f +Subproject commit bf73c50892a24c72111e6176f675aef16a8527e0 From 77a6274761bb7ce8ed1345fbb270acc5ea63b536 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Thu, 20 Sep 2018 14:04:20 -0700 Subject: [PATCH 7/7] Update submodule to merged master --- tests/travis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/travis b/tests/travis index bf73c50892a..e43712d5ab8 160000 --- a/tests/travis +++ b/tests/travis @@ -1 +1 @@ -Subproject commit bf73c50892a24c72111e6176f675aef16a8527e0 +Subproject commit e43712d5ab88e787ef295d087cff7a17e01b7cf2