From 6d88f09105fb60f329b1b91e7d250c718d536872 Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Tue, 11 Jun 2019 02:57:03 +0200
Subject: [PATCH] fix(ci): Update ci for meson
---
.gitlab-ci.yml | 28 +++-------------------------
bootloader/Makefile | 2 +-
2 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f53963649..34957100c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,33 +3,11 @@ image: "debian"
build:
stage: build
before_script:
- - apt update -qq && apt install -y -qq gcc-arm-none-eabi python3-pip
+ - apt update -qq && apt install -y -qq gcc-arm-none-eabi python3-pip meson
- pip3 install crc16
script:
- cd bootloader
- make
- cd ..
- - cd Hello_World
- - ./build_image
- - cd ..
- - cd Hello_World_FreeRTOS
- - ./build_image
- - cd ..
- - cd ble
- - ./build_image
- - cd ..
- - cd bmatest
- - ./build_image
- - cd ..
- - cd bmetest
- - ./build_image
- - cd ..
- - cd ecgtest
- - ./build_image
- - cd ..
- - cd imutest
- - ./build_image
- - cd ..
- - cd ips
- - ./build_image
- - cd ..
+ - meson --cross-file card10-cross.ini build/
+ - ninja -C build/
diff --git a/bootloader/Makefile b/bootloader/Makefile
index e188eecda..88447371d 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -59,7 +59,7 @@ endif
# This is the path to the CMSIS root directory
ifeq "$(MAXIM_PATH)" ""
-LIBS_DIR=../sdk/Libraries
+LIBS_DIR=../lib/sdk/Libraries
else
LIBS_DIR=/$(subst \,/,$(subst :,,$(MAXIM_PATH))/Firmware/$(TARGET_UC)/Libraries)
endif
--
GitLab