diff --git a/.gitignore b/.gitignore index 5e6019bb0acf0cf377edf05eb8a863b7f9d994c8..d7120dc9edfa2e4368f49be5d916e1b8ca4bac75 100644 --- a/.gitignore +++ b/.gitignore @@ -111,4 +111,4 @@ venv.bak/ .mypy_cache/ # Ignore files generated when testing -tests/dummy_files/* +pygeodyn/tests/dummy_files/* diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a200a51ccc2d43fe38a069c03b7497267cab51cd..328f176b5ba28b0438e3e8dbaa7d8b433a514e51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: