Commit e1341aa2 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

CI: Clean up CI scripts

parent c03e3d4c
#!/bin/bash
pip install wheel
set -e
source /test.venv/bin/activate
pip install --upgrade pip wheel setuptools twine
python setup.py sdist
python setup.py bdist_wheel
twine check dist/*
PIPARGS="--retries 10 --timeout 30"
pip install dist/*.whl
pip uninstall -y fsleyes-props
pip install dist/*.tar.gz
pip uninstall -y fsleyes-props
......@@ -30,9 +30,7 @@ if [[ -f /.dockerenv ]]; then
echo "$SSH_PRIVATE_KEY_GIT" > $HOME/.ssh/id_git;
if [[ "$CI_PROJECT_PATH" == "$UPSTREAM_PROJECT" ]]; then
echo "$SSH_PRIVATE_KEY_DOC_DEPLOY" > $HOME/.ssh/id_doc_deploy;
echo "$SSH_PRIVATE_KEY_CONDA_DEPLOY" > $HOME/.ssh/id_conda_deploy;
echo "$SSH_PRIVATE_KEY_CONDA_INDEX" > $HOME/.ssh/id_conda_index;
echo "$SSH_PRIVATE_KEY_DOC_DEPLOY" > $HOME/.ssh/id_doc_deploy;
fi;
chmod go-rwx $HOME/.ssh/id_*;
......@@ -41,7 +39,6 @@ if [[ -f /.dockerenv ]]; then
if [[ "$CI_PROJECT_PATH" == "$UPSTREAM_PROJECT" ]]; then
ssh-add $HOME/.ssh/id_doc_deploy;
ssh-add $HOME/.ssh/id_conda_deploy;
fi
echo "$SSH_SERVER_HOSTKEYS" > $HOME/.ssh/known_hosts;
......@@ -57,16 +54,6 @@ if [[ -f /.dockerenv ]]; then
echo " User ${DOC_HOST%@*}" >> $HOME/.ssh/config;
echo " IdentityFile $HOME/.ssh/id_doc_deploy" >> $HOME/.ssh/config;
echo "Host condadeploy" >> $HOME/.ssh/config;
echo " HostName ${CONDA_HOST##*@}" >> $HOME/.ssh/config;
echo " User ${CONDA_HOST%@*}" >> $HOME/.ssh/config;
echo " IdentityFile $HOME/.ssh/id_conda_deploy" >> $HOME/.ssh/config;
echo "Host condaindex" >> $HOME/.ssh/config;
echo " HostName ${CONDA_HOST##*@}" >> $HOME/.ssh/config;
echo " User ${CONDA_HOST%@*}" >> $HOME/.ssh/config;
echo " IdentityFile $HOME/.ssh/id_conda_index" >> $HOME/.ssh/config;
echo "Host *" >> $HOME/.ssh/config;
echo " IdentitiesOnly yes" >> $HOME/.ssh/config;
......
......@@ -30,4 +30,4 @@ if [ "$TEST_STYLE"x != "x" ]; then pylint --output-format=colorized fsleyes_prop
if [ "$TEST_STYLE"x != "x" ]; then exit 0; fi
# Run the tests
xvfb-run python setup.py test
xvfb-run -a -s "-screen 0 1920x1200x24" python setup.py test
......@@ -146,6 +146,17 @@ test:3.8:
image: pauldmccarthy/fsleyes-py38-wxpy4-gtk3
<<: *test_template
test:build-pypi-dist:
stage: test
image: pauldmccarthy/fsleyes-py36-wxpy4-gtk3
<<: *except_releases
tags:
- docker
script:
- bash ./.ci/build_pypi_dist.sh
#############
# Style stage
......@@ -192,7 +203,7 @@ build-pypi-dist:
<<: *check_version
stage: build
image: python:3.6
image: image: pauldmccarthy/fsleyes-py36-wxpy4-gtk3
tags:
- docker
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment