Skip to content
Snippets Groups Projects
Commit 6d88f091 authored by schneider's avatar schneider
Browse files

fix(ci): Update ci for meson

parent 89a97df3
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 3
− 25
View file @ 6d88f091
...@@ -3,33 +3,11 @@ image: "debian" ...@@ -3,33 +3,11 @@ image: "debian"
build: build:
stage: build stage: build
before_script: 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 - pip3 install crc16
script: script:
- cd bootloader - cd bootloader
- make - make
- cd .. - cd ..
- cd Hello_World - meson --cross-file card10-cross.ini build/
- ./build_image - ninja -C build/
- 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 ..
bootloader/Makefile
+ 1
− 1
View file @ 6d88f091
...@@ -59,7 +59,7 @@ endif ...@@ -59,7 +59,7 @@ endif
# This is the path to the CMSIS root directory # This is the path to the CMSIS root directory
ifeq "$(MAXIM_PATH)" "" ifeq "$(MAXIM_PATH)" ""
LIBS_DIR=../sdk/Libraries LIBS_DIR=../lib/sdk/Libraries
else else
LIBS_DIR=/$(subst \,/,$(subst :,,$(MAXIM_PATH))/Firmware/$(TARGET_UC)/Libraries) LIBS_DIR=/$(subst \,/,$(subst :,,$(MAXIM_PATH))/Firmware/$(TARGET_UC)/Libraries)
endif endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment