From c9e750f2634e715f0ff40f5a56bfd67f086040e8 Mon Sep 17 00:00:00 2001
From: Filippo Cremonese <filippocremonese@rev.ng>
Date: Thu, 17 Sep 2020 15:42:04 +0200
Subject: [PATCH] Ensure wheel is installed
---
.gitlab-ci.yml | 2 +-
.orchestra/ci/install-dependencies.sh | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcdddbd..c4e1aad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,10 +6,10 @@ stages:
create-binaries:
stage: build
script:
- - /install-dependencies.sh
- echo -e "machine rev.ng\nlogin gitlab-ci-token\npassword ${CI_JOB_TOKEN}" > ~/.netrc
- git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@rev.ng/gitlab/${CI_PROJECT_NAMESPACE}/orchestra-v3.git /orchestra
- cd /orchestra
+ - .orchestra/ci/install-dependencies.sh
- python3 setup.py bdist_wheel
- pip install dist/orchestra*.whl
- cd "${CI_PROJECT_DIR}"
diff --git a/.orchestra/ci/install-dependencies.sh b/.orchestra/ci/install-dependencies.sh
index 1741c5c..fb88584 100755
--- a/.orchestra/ci/install-dependencies.sh
+++ b/.orchestra/ci/install-dependencies.sh
@@ -65,6 +65,8 @@ apt install --no-install-recommends --yes \
libxkbcommon-x11-dev \
libxrender-dev
+pip3 install setuptools wheel
+
if ! which git-lfs >& /dev/null; then
curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
apt-get install --no-install-recommends --yes git-lfs
--
GitLab