Commit 9c15a8a1 authored by Philippe Kalaf's avatar Philippe Kalaf

Merge branch 'master' of gitlab.com:burgerman/espresso-for-geeks

parents 4ce0cc7f 24cefcd6
Pipeline #29287918 passed with stages
in 2 minutes and 40 seconds
image: registry.gitlab.com/burgerman/espresso-for-geeks/fedora
stages:
- setup
- build
build:
stage: build
artifacts:
name: "espresso-for-geeks-$CI_COMMIT_REF_NAME"
paths:
- BUILD/espresso-for-geeks.bin
script:
- make
build-docker:
stage: setup
image: docker:stable
variables:
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2
services:
- docker:dind
when: manual
script:
- docker info
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
- docker build -t registry.gitlab.com/burgerman/espresso-for-geeks/fedora .
- docker push registry.gitlab.com/burgerman/espresso-for-geeks/fedora
FROM fedora:28
RUN echo fastestmirror=1 >> /etc/dnf/dnf.conf && \
dnf -y update && \
dnf -y install make arm-none-eabi-newlib arm-none-eabi-gcc-cs-c++ arm-none-eabi-gcc-cs && \
dnf clean all
......@@ -46,4 +46,10 @@ Future features:
* Recipes/Flavor profiles/Rating
* Advanced visualization
Fedora setup:
```
sudo dnf install make arm-none-eabi-newlib arm-none-eabi-gcc-cs-c++ arm-none-eabi-gcc-cs
```
See http://espresso-for-geeks.kalaf.net/features/
......@@ -459,5 +459,7 @@ uint16_t BrewControl::get_last_pulse_count_top()
{
#ifdef TEMP2
return _temp2_sensor.get_last_pulse_count();
#else
return 0;
#endif
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment