diff options
| author | bnewbold <bnewbold@archive.org> | 2021-01-05 01:17:00 +0000 |
|---|---|---|
| committer | bnewbold <bnewbold@archive.org> | 2021-01-05 01:17:00 +0000 |
| commit | 7c2501542395296ba0c2791f74ba3036a342a45a (patch) | |
| tree | 5f1be2f80d739d7bc42ea6f00c0d960aac8e12d3 /.gitlab-ci.yml | |
| parent | 44b91bed5a0fb3dab46fd0641691bb9e6b5b6078 (diff) | |
| parent | 830cb7eb006507cd3d176efe25a34f8a02cce677 (diff) | |
| download | fatcat-7c2501542395296ba0c2791f74ba3036a342a45a.tar.gz fatcat-7c2501542395296ba0c2791f74ba3036a342a45a.zip | |
Merge branch 'bnewbold-ci-cleanups' into 'master'
Gitlab CI and docker base image cleanups
See merge request webgroup/fatcat!94
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c563c487..edbaca5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ variables: PIPENV_VENV_IN_PROJECT: "true" CARGO_HOME: ".cargo_cache" -image: "bnewbold/fatcat-test-base:latest" +image: "bnewbold/fatcat-test-base:xenial" unified_test: variables: @@ -28,9 +28,15 @@ 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 pkg-config python3-pytest git + - > + apt install -y + software-properties-common wget pkg-config git + libpq-dev libsnappy-dev libsodium-dev + python3.7 python3.7-dev python3.7-venv python3.7-distutils + python3.8 python3.8-dev python3.8-venv python3.8-distutils + python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest - 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 || python3.5 -m pip install pipenv - pipenv --version script: - rustc --version && cargo --version && diesel --version @@ -61,7 +67,11 @@ rust_build_release: 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 + - > + apt install -y + software-properties-common wget pkg-config git + libpq-dev libsnappy-dev libsodium-dev + python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest script: - rustc --version && cargo --version - cd rust @@ -76,7 +86,13 @@ python_build_release: when: manual before_script: - apt update -qy - - apt install -y python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest libsnappy-dev libsodium-dev + - > + apt install -y + software-properties-common wget pkg-config git + libpq-dev libsnappy-dev libsodium-dev + python3.7 python3.7-dev python3.7-venv python3.7-distutils + python3.8 python3.8-dev python3.8-venv python3.8-distutils + python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest - pip3 install pipenv script: - python3 --version |