From 9018244b8b14b2e2807b6330c5ff0d44c1d2d742 Mon Sep 17 00:00:00 2001
From: q3k <q3k@q3k.org>
Date: Tue, 30 Jul 2019 11:40:15 +0000
Subject: [PATCH] fix(ci): Add pillow & fix build-stage
---
.gitlab-ci.yml | 5 ++++-
docker/build-env/Dockerfile | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b893897..d3aa7f70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
# maintained by q3k, built using docker/build-env
-image: "registry.k0.hswaw.net/q3k/card10-build-env:20190725-110707Z-4f3bf2a"
+image: "registry.k0.hswaw.net/q3k/card10-build-env:20190729-231409Z-635fb98"
build:
stage: build
@@ -7,6 +7,9 @@ build:
- ./bootstrap.sh
- ninja -C build/
- arm-none-eabi-size build/bootloader/bootloader.elf build/epicardium/epicardium.elf build/pycardium/pycardium.elf
+ only:
+ - merge_requests
+ - master
lint:
stage: test
diff --git a/docker/build-env/Dockerfile b/docker/build-env/Dockerfile
index 4cab5b4f..57066387 100644
--- a/docker/build-env/Dockerfile
+++ b/docker/build-env/Dockerfile
@@ -9,6 +9,6 @@ RUN set -e -x ;\
python3-pip ;\
apt-get install -y -t stretch-backports \
meson ;\
- pip3 install crc16 ;\
+ pip3 install crc16 pillow ;\
rm -rf /var/lib/apt/lists
--
GitLab