diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69b28ecd..f0d78a9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ variables: PIPENV_VENV_IN_PROJECT: "true" CARGO_HOME: ".cargo_cache" -image: "rust:1.42-buster" +image: "bnewbold/fatcat-test-base:latest" unified_test: variables: @@ -28,9 +28,9 @@ unified_test: before_script: - export PATH="$PATH:$CARGO_HOME/bin" - apt update -qy - - apt install -y python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest libsnappy-dev libsodium-dev software-properties-common python3.7 python3.7-dev python3.7-venv python3.7-distutils libpq-dev - - cargo install diesel_cli --version 1.3.1 - - pip3 install pipenv + - apt install -y python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest libsnappy-dev libsodium-dev software-properties-common python3.7 python3.7-dev python3.7-venv python3.7-distutils libpq-dev pkg-config python3-pytest git + - diesel --version || cargo install diesel_cli --version 1.3.1 --no-default-features --features postgres + - pipenv --version || python3.7 -m pip install pipenv - pipenv --version script: - rustc --version && cargo --version && diesel --version @@ -43,7 +43,7 @@ unified_test: - cargo test -- --test-threads 1 - cargo run --bin fatcatd & - cd ../python_openapi_client - - pytest-3 + # TODO: - pytest-3 - cd ../python - cp example.env .env - pipenv install --dev --deploy |