diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-05-11 10:57:59 -0400 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-05-11 10:57:59 -0400 |
| commit | ba019c52a4e9a5697d33fe84e70db0ccb5aa7cae (patch) | |
| tree | a37d7ed837eaaac97e23c3ee5c28c46e2a31ee2c | |
| parent | 4855854a3a04acda956637d89a5c722a3ef616a0 (diff) | |
Try using new build image.
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4c3a5b..f7a5965 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 . |