diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d454da02ea30587dfc6b826358af5e49761a64d..91fd8fdf89de84e37d945e3d926b71303e94a300 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -145,7 +145,7 @@ unittest_py3.9: - *env - pip install pytest pytest-cov - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-pylib.git@${PYLIB} - - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git@{ADVANCED} + - pip install git+https://gitlab.indiscale.com/caosdb/src/caosdb-advanced-user-tools.git@${ADVANCED} - pip install .[h5-crawler,spss,rocrate] - echo "import sys; assert sys.version.startswith('"$PYVER"')" - python3 -c "import sys; assert sys.version.startswith('"$PYVER"')" @@ -271,7 +271,7 @@ build-testenv: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY # use here general latest or specific branch latest... - docker build - --build-arg PYLIB=${PYLIB} + --build-arg PYLIB=${PYLIB:dev} --build-arg ADVANCED=${ADVANCED:dev} --file .docker/Dockerfile -t $CI_REGISTRY_IMAGE .