Commit 5e2f7eb5 authored by Loic Huder's avatar Loic Huder
Browse files

Fixed .gitignore and .gitlab-ci.yml with new package structure


Former-commit-id: 229c9a0d
parent 256e6f78
......@@ -111,4 +111,4 @@ venv.bak/
.mypy_cache/
# Ignore files generated when testing
tests/dummy_files/*
pygeodyn/tests/dummy_files/*
......@@ -79,7 +79,7 @@ pages:
- master
- web
# CONTINUOUS RELEASE : hidden jobs for now (starts with .), will not be launched
# CONTINUOUS RELEASE : hidden jobs for now (start with .), will not be launched
.test_validity_merge:
stage: test
......@@ -87,7 +87,7 @@ pages:
- echo $CI_MERGE_REQUEST_TITLE # WILL ONLY WORK AT Gitlab 11.9
- python3 setup.py install --user
- python3 setup.py test
- python3 release/test_release.py
- python3 pygeodyn/release/test_release.py
only:
refs:
......@@ -102,11 +102,11 @@ pages:
GIT_STRATEGY: none
script:
- git clone http://$CR_USERNAME:$CR_TOKEN@gricad-gitlab.univ-grenoble-alpes.fr/Geodynamo/pygeodyn.git
- cd pygeodyn_testcd
- cd pygeodyn
- git checkout master
- git pull
- python3 release/releasing.py > changes.log
- ./release/do_git_release.sh
- python3 pygeodyn/release/releasing.py > changes.log
- ./pygeodyn/release/do_git_release.sh
- git push http://$CR_USERNAME:$CR_TOKEN@gricad-gitlab.univ-grenoble-alpes.fr/Geodynamo/pygeodyn.git master --tags
only:
refs:
......
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