Try using new build image.

This commit is contained in:
Pete Johanson 2020-05-11 10:57:59 -04:00
parent 4855854a3a
commit ba019c52a4
1 changed files with 6 additions and 5 deletions

View File

@ -1,13 +1,17 @@
variables:
CI_BUILD_IMAGE: $CI_REGISTRY_IMAGE/zmk-build
build:
image: zephyrprojectrtos/zephyr-build
image: $CI_BUILD_IMAGE
variables:
GIT_CLONE_PATH: $CI_BUILD_DIR/zmk
before_script:
- west init -l .
- west update
- west config --global zephyr.base-prefer configfile
- west zephyr-export
- pip3 install --user -r ../zephyr/scripts/requirements.txt
script:
- west build -b nucleo_wb55rg -- -DSHIELD=petejohanson_handwire
@ -18,13 +22,10 @@ build:dockerimage:
image: docker:stable
variables:
CI_BUILD_IMAGE: $CI_REGISTRY_IMAGE/zmk-build
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
- docker pull $CI_BUILD_IMAGE:latest || true
- docker build --cache-from $CI_BUILD_IMAGE:latest -t $CI_BUILD_IMAGE:latest .