summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2020-12-21 22:24:36 -0800
committerBryan Newbold <bnewbold@robocracy.org>2020-12-22 18:28:35 -0800
commit830cb7eb006507cd3d176efe25a34f8a02cce677 (patch)
tree7e7fcd4143b72499a4d4bf7a881c3c7d1dd00e5b /.gitlab-ci.yml
parent623d25deff110a05e591e376f3f44663e207fef0 (diff)
downloadfatcat-830cb7eb006507cd3d176efe25a34f8a02cce677.tar.gz
fatcat-830cb7eb006507cd3d176efe25a34f8a02cce677.zip
gitlab CI: cleanups
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml24
1 files changed, 20 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95b3567b..edbaca5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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