diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1304ee11d1b5d5ce1ef6c0c587fe610018c14755..428002b8b0df9a938fe1e7f54e51b2b0bcd4fff7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,11 @@ -default: - image: python:3.8.5-slim-buster - before_script: - - apt-get update - - apt-get install -y libpq-dev gcc gnupg git - #- pip install pytest pytest-celery pytest-mock eth-tester - - pip install --extra-index-url https://pip.grassrootseconomics.net:8433 -r requirements.txt - - pip install --extra-index-url https://pip.grassrootseconomics.net:8433 -r test_requirements.txt - - git clone --depth 1 https://gitlab.com/grassrootseconomics/bancor-contracts bancor - - cd bancor - # d6e39d5fbdb95068e92379a9139f48021da2f95a + build - - git fetch --depth 1 origin 77a6deeafef3620d1d53e3c54856c2c0cfb812e8 - - git checkout 77a6deeafef3620d1d53e3c54856c2c0cfb812e8 - - cd .. - #- mv bancor /usr/local/lib/python3.8/site-packages/cic_registry/ - - pwd +.contract-migration-changes-target: + rules: + - changes: + - $CONTEXT/* -test-dev: - script: - - CICTEST_BANCOR_DIR=`pwd`/bancor/solidity/build/contracts pytest -v -s --log-cli-level DEBUG --log-level DEBUG --cov=cic_eth --cov-fail-under=90 --cov-report term-missing tests - #- echo "no tests executed, will fail without synced ganache-cli, need mock or omit functional tests" +build-cic-eth: + extends: + - .contract-migration-changes-target + - .py-build + variables: + CONTEXT: apps/cic-eth \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 42fdfee735315950e115e6b077853cf4157ef3ba..88dfea8c968f53a4fe91aa24c753ab3a7282d6e8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,7 @@ ARG root_requirement_file='requirements.txt' #RUN apk add linux-headers #RUN apk add libffi-dev RUN apt-get update && \ - apt install -y gcc gnupg libpq-dev wget make g++ gnupg bash + apt install -y gcc gnupg libpq-dev wget make g++ gnupg bash procps # Copy shared requirements from top of mono-repo RUN echo "copying root req file ${root_requirement_file}"