diff options
author | VirtualTam <virtualtam@flibidi.net> | 2015-07-18 11:56:41 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2015-07-18 13:43:19 +0200 |
commit | d0ce99e59ecc8d62eefbf1322736880159a7e9e7 (patch) | |
tree | a4f57a6e74d9d155f9bf4b8af34b4e491eabeb5b | |
parent | 2ac5938b670997454f00e9f1d8f7459e428bb331 (diff) | |
download | Shaarli-d0ce99e59ecc8d62eefbf1322736880159a7e9e7.tar.gz Shaarli-d0ce99e59ecc8d62eefbf1322736880159a7e9e7.tar.zst Shaarli-d0ce99e59ecc8d62eefbf1322736880159a7e9e7.zip |
Makefile: do not call `clean` before `test`
Fixes #288
Modifications:
- call `make clean` explicitely to clean the workspace
- add `make clean` to Travis instructions
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | Makefile | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index d10311c9..80db6506 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -9,4 +9,5 @@ install: | |||
9 | - composer self-update | 9 | - composer self-update |
10 | - composer install | 10 | - composer install |
11 | script: | 11 | script: |
12 | - make clean | ||
12 | - make test | 13 | - make test |
@@ -102,7 +102,7 @@ mess_detector_summary: mess_title | |||
102 | # See phpunit.xml for configuration | 102 | # See phpunit.xml for configuration |
103 | # https://phpunit.de/manual/current/en/appendixes.configuration.html | 103 | # https://phpunit.de/manual/current/en/appendixes.configuration.html |
104 | ## | 104 | ## |
105 | test: clean | 105 | test: |
106 | @echo "-------" | 106 | @echo "-------" |
107 | @echo "PHPUNIT" | 107 | @echo "PHPUNIT" |
108 | @echo "-------" | 108 | @echo "-------" |
@@ -114,13 +114,13 @@ test: clean | |||
114 | 114 | ||
115 | ### remove all unversioned files | 115 | ### remove all unversioned files |
116 | clean: | 116 | clean: |
117 | @git clean -df | 117 | @git clean -df |
118 | 118 | ||
119 | ### update the local copy of the documentation | 119 | ### update the local copy of the documentation |
120 | doc: clean | 120 | doc: clean |
121 | @rm -rf doc | 121 | @rm -rf doc |
122 | @git clone https://github.com/shaarli/Shaarli.wiki.git doc | 122 | @git clone https://github.com/shaarli/Shaarli.wiki.git doc |
123 | @rm -rf doc/.git | 123 | @rm -rf doc/.git |
124 | 124 | ||
125 | ### Convert local markdown documentation to HTML | 125 | ### Convert local markdown documentation to HTML |
126 | htmldoc: | 126 | htmldoc: |