diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-05-11 13:40:58 -0400 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-05-11 13:40:58 -0400 |
| commit | 9eb503640b10e9fc40a37784c69ce2c00c047e58 (patch) | |
| tree | b817035e0cfca804718a91c27680e7ac20079f48 | |
| parent | 182a3166668d5f431fc4dbc91b00c884a70f74ee (diff) | |
Tweaks for workspace directory.
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf08caa..16baabd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,10 +9,10 @@ build: cache: paths: - - ci-workspace/modules - - ci-workspace/tools - - ci-workspace/zephyr - - ci-workspace/bootloader + - workspace/modules + - workspace/tools + - workspace/zephyr + - workspace/bootloader image: $CI_BUILD_IMAGE:v0.1.1 @@ -20,15 +20,17 @@ build: GIT_CLONE_PATH: $CI_BUILDS_DIR/zmk before_script: - - mkdir ci-workspace && ln -s $(pwd) ci-workspace/zmk - - cd ci-workspace/zmk + - mkdir -p workspace/zmk + - mv * workspace/zmk || true + - mv .* workspace/zmk || true + - cd workspace/zmk - west init -l . - west update - west config --global zephyr.base-prefer configfile - west zephyr-export script: - - cd ci-workspace/zmk + - cd workspace/zmk - west build -b nucleo_wb55rg -- -DSHIELD=petejohanson_handwire build:dockerimage: |