diff --git a/.travis.yml b/.travis.yml index 15d33c0a..7f4298ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,10 @@ stages: - github releases - deploy +before_install: + - export LAST_TAG=`git describe --abbrev=0 --tags` + - export CURRENT_VERSION=v`cat VERSION` + before_script: - nvm install 10 - make install @@ -257,8 +261,12 @@ jobs: condition: "$LAST_TAG != $CURRENT_VERSION" if: branch = master AND type = push AND fork = false - stage: deploy + before_install: skip + before_script: skip + script: make svn_clone deploy: cleanup: false provider: script - script: make - if: branch = master AND type = push AND fork = false \ No newline at end of file + script: make svn_push + if: branch = master AND type = push AND fork = false + after_success: make remove_dir \ No newline at end of file diff --git a/Makefile b/Makefile index fb8f0c93..f9e10980 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,6 @@ VERSION = `cat $(FILE)` .PHONY: test -all: svn_clone svn_push remove_dir - svn_clone: mkdir /tmp/svn_plugin_dir svn co $(SVNREPOURL) /tmp/svn_plugin_dir --username $(USERNAME) --password $(PASSWORD) --no-auth-cache