mirror of
https://github.com/jorgebucaran/fisher
synced 2024-10-09 09:36:53 +02:00
Fix travis and remove slippery make remains.
This commit is contained in:
parent
1275b68e52
commit
4cd890ca97
5 changed files with 3 additions and 75 deletions
|
@ -4,4 +4,5 @@ before_install:
|
||||||
- sudo apt-get update
|
- sudo apt-get update
|
||||||
- sudo apt-get -y install fish
|
- sudo apt-get -y install fish
|
||||||
script:
|
script:
|
||||||
- make && fish -c "fisher i fishery/fishtape; fishtape test/*.fish"
|
- curl -sL get.fisherman.sh | fish
|
||||||
|
- fish -c "fisher i fishery/fishtape; fishtape test/*.fish"
|
||||||
|
|
|
@ -242,7 +242,7 @@ git push origin master
|
||||||
[travis-link]: https://travis-ci.org/fisherman/fisherman
|
[travis-link]: https://travis-ci.org/fisherman/fisherman
|
||||||
[travis-badge]: https://img.shields.io/travis/fisherman/fisherman.svg?style=flat-square
|
[travis-badge]: https://img.shields.io/travis/fisherman/fisherman.svg?style=flat-square
|
||||||
|
|
||||||
[version-badge]: https://img.shields.io/badge/latest-v1.4.0-00B9FF.svg?style=flat-square
|
[version-badge]: https://img.shields.io/badge/latest-v1.5.0-00B9FF.svg?style=flat-square
|
||||||
[version-link]: https://github.com/fisherman/fisherman/releases
|
[version-link]: https://github.com/fisherman/fisherman/releases
|
||||||
|
|
||||||
[slack-link]: https://fisherman-wharf.herokuapp.com/
|
[slack-link]: https://fisherman-wharf.herokuapp.com/
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
function __fisher_path_make -a path
|
|
||||||
if test ! -s $path/Makefile -a ! -s $path/makefile
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
debug "make %s" "$path/Makefile"
|
|
||||||
|
|
||||||
pushd $path
|
|
||||||
|
|
||||||
set -e argv[1]
|
|
||||||
|
|
||||||
if not make $argv
|
|
||||||
debug "make fail %s" "$argv"
|
|
||||||
popd
|
|
||||||
return 1
|
|
||||||
end
|
|
||||||
|
|
||||||
popd
|
|
||||||
end
|
|
|
@ -44,7 +44,6 @@ function fisher_install -d "Install plugins (i)"
|
||||||
set -l path $fisher_cache/$plugin
|
set -l path $fisher_cache/$plugin
|
||||||
|
|
||||||
if test -d $path
|
if test -d $path
|
||||||
__fisher_path_make "$path" --quiet
|
|
||||||
__fisher_plugin_enable "$plugin" "$path"
|
__fisher_plugin_enable "$plugin" "$path"
|
||||||
|
|
||||||
set count (math $count + 1)
|
set count (math $count + 1)
|
||||||
|
|
|
@ -1,53 +0,0 @@
|
||||||
set -l path $DIRNAME/.t-$TESTNAME-(random)
|
|
||||||
|
|
||||||
function -S setup
|
|
||||||
mkdir -p $path/{good,empty,none}
|
|
||||||
|
|
||||||
echo . > $path/good/Makefile
|
|
||||||
touch $path/empty/Makefile
|
|
||||||
|
|
||||||
function make
|
|
||||||
if test ! -z "$argv"
|
|
||||||
|
|
||||||
# When we install a plugin that includes a Makefile we must make sure to run
|
|
||||||
# only its default targets, not `make install`.
|
|
||||||
|
|
||||||
# A plugin may support multiple install methods and the install target would
|
|
||||||
# bypass Fisherman. A good example is Fishtape itself.
|
|
||||||
|
|
||||||
return 1
|
|
||||||
end
|
|
||||||
|
|
||||||
# We also want to check whether we are inside the root of the project when
|
|
||||||
# running `make` in order to improve our chances of success.
|
|
||||||
|
|
||||||
pwd
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function -S teardown
|
|
||||||
rm -rf $path
|
|
||||||
functions -e make
|
|
||||||
end
|
|
||||||
|
|
||||||
test "$TESTNAME - Do not run any make targets"
|
|
||||||
(__fisher_path_make $path/good > /dev/null; printf $status) -ne 1
|
|
||||||
end
|
|
||||||
|
|
||||||
test "$TESTNAME - Run make at the root of the plugin directory"
|
|
||||||
(__fisher_path_make $path/good) = "$path/good"
|
|
||||||
end
|
|
||||||
|
|
||||||
set -l last_pwd
|
|
||||||
|
|
||||||
test "$TESTNAME - Pop path after make exits"
|
|
||||||
(set last_pwd (pwd); __fisher_path_make $path/good > /dev/null; pwd) = "$last_pwd"
|
|
||||||
end
|
|
||||||
|
|
||||||
test "$TESTNAME - Succeed even if makefile is empty"
|
|
||||||
(__fisher_path_make $path/empty; printf $status) -eq 0
|
|
||||||
end
|
|
||||||
|
|
||||||
test "$TESTNAME - Succeed even if there is no makefile"
|
|
||||||
(__fisher_path_make $path/none; printf $status) -eq 0
|
|
||||||
end
|
|
Loading…
Reference in a new issue