diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b893897a3752949819d3c0ec2d0fb018c9db793..d3aa7f70a4e39d6db7c436a47cdc78986c0d3e9e 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 4cab5b4ff4fd70ada034821f7cf6e21c878a3bd6..57066387e4cb44fb49663f304f09d672e3f0c11a 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