diff --git a/distelli-manifest.yml b/distelli-manifest.yml index b6cb8d1..13abcf1 100644 --- a/distelli-manifest.yml +++ b/distelli-manifest.yml @@ -1,19 +1,9 @@ ipcrm/puppet_webapp: PreBuild: - - wget https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 -O jq - - chmod +x jq - - git clone https://github.com/pyenv/pyenv.git ~/.pyenv - - export PYENV_ROOT="$HOME/.pyenv" - - export PATH="$PYENV_ROOT/bin:$PATH" - - eval "$(pyenv init -)" - - pyenv install 2.7.10 - - pyenv local 2.7.10 - - pip install -r requirements.txt - - pip install discover - - python ./test.py -v + - sh ./scripts/pre_build.sh Build: - - python ./setup.py sdist - PkgInclude: - - 'dist/*.tar.gz' + - sh ./scripts/build.sh AfterBuildSuccess: - sh ./scripts/after_build.sh + PkgInclude: + - 'dist/*.tar.gz' diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100644 index 0000000..9ec0658 --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,6 @@ +export PYENV_ROOT="$HOME/.pyenv" +export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init -)" +pyenv local 2.7.10 +python ./test.py -v +python ./setup.py sdist diff --git a/scripts/pre_build.sh b/scripts/pre_build.sh new file mode 100644 index 0000000..f1309ee --- /dev/null +++ b/scripts/pre_build.sh @@ -0,0 +1,10 @@ +curl -s -o jq 'https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64' +chmod +x jq +git clone https://github.com/pyenv/pyenv.git ~/.pyenv +export PYENV_ROOT="$HOME/.pyenv" +export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init -)" +pyenv install 2.7.10 +pyenv local 2.7.10 +pip install -r requirements.txt +pip install discover diff --git a/webui/_version.py b/webui/_version.py index e6d0c4f..377e1f6 100644 --- a/webui/_version.py +++ b/webui/_version.py @@ -1 +1 @@ -__version__ = '0.1.12' +__version__ = '0.1.13'