From 242b50cc087049b0e4c18e2b52df02438c25613b Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Tue, 10 Dec 2019 13:53:50 +0100
Subject: [PATCH] [CI] Use eatmydata in container setup and dependency
installation
---
.gitlab-ci.yml | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d809d455a..a3f8fec80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,20 +18,24 @@ test:
image:
name: python:3.8-buster
before_script:
- - apt-get -y update && apt-get -y install postgresql libpq5 libpq-dev libssl-dev sudo
- - pip install "poetry==${POETRY_VERSION}"
+ - apt-get -y update
+ - apt-get -y install eatmydata
+ - eatmydata apt-get -y install postgresql libpq5 libpq-dev libssl-dev sudo
+ - eatmydata pip install "poetry==${POETRY_VERSION}"
- adduser --disabled-password --gecos "Test User" testuser
script:
- - sudo -u testuser poetry install
- - sudo -u testuser poetry run tox
+ - sudo -u testuser eatmydata poetry install
+ - sudo -u testuser eatmydata poetry run tox
build_dist:
stage: build
image:
name: python:3.8-buster
before_script:
- - apt-get -y update && apt-get -y sudo
- - pip install "poetry==${POETRY_VERSION}"
+ - apt-get -y update
+ - apt-get -y install eatmydata
+ - eatmydata apt-get -y install sudo
+ - eatmydata pip install "poetry==${POETRY_VERSION}"
- adduser --disabled-password --gecos "Test User" testuser
script:
- sudo -u testuser poetry build
@@ -111,10 +115,17 @@ pages:
image:
name: python:3.8-buster
before_script:
+<<<<<<< Updated upstream
- apt-get -y update && apt-get -y install make
- pip install "poetry==${POETRY_VERSION}"
+=======
+ - apt-get -y update
+ - apt-get -y install eatmydata
+ - eatmydata apt-get -y install make
+ - eatmydata pip install poetry
+>>>>>>> Stashed changes
script:
- - poetry install
+ - eatmydata poetry install
- poetry run make -C docs html BUILDDIR=../public/docs
artifacts:
paths:
--
GitLab