Skip to content

Commit

Permalink
fix: clean up tasks
Browse files Browse the repository at this point in the history
* remove pico
  • Loading branch information
abeimler committed Jan 16, 2023
1 parent d57af36 commit 2c6b50a
Show file tree
Hide file tree
Showing 17 changed files with 24 additions and 308 deletions.
3 changes: 0 additions & 3 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ tasks:
- task: install:lint
- task: minimal:lint
- task: emscripten:lint
- task: rpi3:lint
- task: rpi4:lint
- task: rpi4-vcpkg:lint
- task: pico:lint
- npx -y cspell lint --no-progress --show-suggestions

clean:
Expand Down
15 changes: 5 additions & 10 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,21 @@ services:
context: .
dockerfile: ./docker/Dockerfile.arm
target: build
build-rpi3-release:
build-rpi3-debug:
build:
context: .
dockerfile: ./docker/Dockerfile.arm
target: build-release
target: build-debug
build-rpi4:
build:
context: .
dockerfile: ./docker/Dockerfile.aarch64
target: build
build-rpi4-release:
build-rpi4-debug:
build:
context: .
dockerfile: ./docker/Dockerfile.aarch64
target: build-release
target: build-debug
test-rpi4:
build:
context: .
Expand All @@ -113,9 +113,4 @@ services:
build:
context: .
dockerfile: ./docker/Dockerfile.aarch64
target: build-custom
build-pico:
build:
context: .
dockerfile: ./docker/Dockerfile.pico
target: build
target: build-custom
6 changes: 3 additions & 3 deletions docker/Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ COPY . /home/project_options
WORKDIR /home/project_options
CMD ["/bin/bash", "-c", "task rpi4:build.cross"]

FROM setup AS build-release
FROM setup AS build-debug
COPY . /home/project_options
WORKDIR /home/project_options
CMD ["/bin/bash", "-c", "task rpi4:build.cross.release"]
CMD ["/bin/bash", "-c", "task rpi4:build.cross.debug"]

FROM setup AS build-vcpkg
COPY . /home/project_options
Expand All @@ -49,4 +49,4 @@ RUN apt-get update && apt-get install -y \
COPY . /home/project_options
WORKDIR /home/project_options
ENV QEMU_LD_PREFIX /usr/aarch64-linux-gnu
CMD ["/bin/bash", "-c", "task rpi4:build.cross.release && qemu-aarch64 /home/project_options/tests/rpi4/build/Release/example"]
CMD ["/bin/bash", "-c", "task rpi4:build.cross && qemu-aarch64 /home/project_options/tests/rpi4/build/Release/example"]
4 changes: 2 additions & 2 deletions docker/Dockerfile.arm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ WORKDIR /home/project_options
CMD ["/bin/bash", "-c", "task rpi3:build.cross"]


FROM setup AS build-release
FROM setup AS build-debug
COPY . /home/project_options
WORKDIR /home/project_options
CMD ["/bin/bash", "-c", "task rpi3:build.cross.release"]
CMD ["/bin/bash", "-c", "task rpi3:build.cross.debug"]
8 changes: 0 additions & 8 deletions tests/pico/.dockerignore

This file was deleted.

7 changes: 0 additions & 7 deletions tests/pico/.gitignore

This file was deleted.

119 changes: 0 additions & 119 deletions tests/pico/CMakeLists.txt

This file was deleted.

21 changes: 0 additions & 21 deletions tests/pico/LICENSE.TXT

This file was deleted.

10 changes: 0 additions & 10 deletions tests/pico/Taskfile.yml

This file was deleted.

8 changes: 0 additions & 8 deletions tests/pico/hello_world.c

This file was deleted.

73 changes: 0 additions & 73 deletions tests/pico/pico_sdk_import.cmake

This file was deleted.

8 changes: 0 additions & 8 deletions tests/pico/vcpkg.json

This file was deleted.

15 changes: 6 additions & 9 deletions tests/rpi3/Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,22 @@
version: 3

tasks:
build:
build.debug:
- cmake . -B ./build -DCMAKE_BUILD_TYPE:STRING=Debug -G '{{.CMAKE_GENERATOR | default "Ninja Multi-Config"}}' {{.CMAKE_ARGS}}
- cmake --build ./build --config Debug

build.release:
build:
- cmake . -B ./build -DCMAKE_BUILD_TYPE:STRING=Release -G '{{.CMAKE_GENERATOR | default "Ninja Multi-Config"}}' {{.CMAKE_ARGS}}
- cmake --build ./build --config Release

build.cross:
build.cross.debug:
cmds:
- task: build
- task: build.debug
vars:
CMAKE_ARGS: -DENABLE_CHECKING:BOOL=ON -DENABLE_CROSS_COMPILING:BOOL=ON -DCMAKE_C_COMPILER={{.CROSS_CC | default "arm-none-eabi-gcc"}} -DCMAKE_CXX_COMPILER={{.CROSS_CXX | default "arm-none-eabi-g++"}} -DDEFAULT_TRIPLET=arm-linux

build.cross.release:
build.cross:
cmds:
- task: build.release
- task: build
vars:
CMAKE_ARGS: -DENABLE_CROSS_COMPILING:BOOL=ON -DCMAKE_C_COMPILER={{.CROSS_CC | default "arm-none-eabi-gcc"}} -DCMAKE_CXX_COMPILER={{.CROSS_CXX | default "arm-none-eabi-g++"}} -DDEFAULT_TRIPLET=arm-linux

lint:
- ~/vcpkg/vcpkg format-manifest ./vcpkg.json
8 changes: 0 additions & 8 deletions tests/rpi3/vcpkg.json

This file was deleted.

Loading

0 comments on commit 2c6b50a

Please sign in to comment.