feat: make enable_cross_compiler more open-closed (aminya#180)

abeimler · Jan 25, 2023 · 742777c · 742777c
1 parent 7a0987f
commit 742777c
Show file tree

Hide file tree

Showing 20 changed files with 403 additions and 103 deletions.
diff --git a/.github/workflows/ci.cross.arm.yml b/.github/workflows/ci.cross.arm.yml
@@ -19,21 +19,33 @@ jobs:
           - true
         task:
           - rpi4:build.cross
-          - rpi4-vcpkg:build.cross
           - rpi4:build.cross.custom-toolchain
+          - rpi4-vcpkg:build.cross
+          - rpi4-vcpkg:build.cross.custom-toolchain
+          - rpi4:build.cross.aarch64
           - rpi3:build.cross
+          - rpi3:build.cross.bare-metal
         include:
           - task: rpi4:build.cross
             install-cross-compiler: g++-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
             target: aarch64-linux-gnu
+          - task: rpi4:build.cross.custom-toolchain
+            install-cross-compiler: g++-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
+            target: aarch64-linux-gnu
           - task: rpi4-vcpkg:build.cross
             install-cross-compiler: g++-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
             target: aarch64-linux-gnu
-          - task: rpi4:build.cross.custom-toolchain
+          - task: rpi4-vcpkg:build.cross.custom-toolchain
+            install-cross-compiler: g++-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
+            target: aarch64-linux-gnu
+          - task: rpi4:build.cross.aarch64
             install-cross-compiler: g++-aarch64-linux-gnu gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
             target: aarch64-linux-gnu
           - task: rpi3:build.cross
-            install-cross-compiler: gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi
+            install-cross-compiler: gcc-arm-linux-gnueabi g++-arm-linux-gnueabi gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf 
+            target: arm-linux-gnueabi
+          - task: rpi3:build.cross.bare-metal
+            install-cross-compiler: gcc-arm-none-eabi g++-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi
             target: arm-none-eabi
     steps:
       - uses: actions/checkout@v3
@@ -64,7 +76,6 @@ jobs:
           clangtidy: true
           task: true
           doxygen: true
-          powershell: true
 
       - name: Setup ARM (Cross) Compiler
         uses: awalsh128/cache-apt-pkgs-action@latest

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -109,8 +109,23 @@ services:
       context: .
       dockerfile: ./docker/Dockerfile.aarch64
       target: build-vcpkg
+  build-rpi4-vcpkg-custom:
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile.aarch64
+      target: build-vcpkg-custom
   build-rpi4-custom:
     build:
       context: .
       dockerfile: ./docker/Dockerfile.aarch64
-      target: build-custom
+      target: build-custom
+  build-rpi4-aarch64:
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile.aarch64
+      target: build-aarch64
+  build-rpi3-bare-metal:
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile.arm-bare-metal
+      target: build
diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
@@ -45,6 +45,17 @@ WORKDIR /home/project_options
 RUN git submodule update --init
 CMD ["/bin/bash", "-c", "task rpi4:build.cross.custom-toolchain"]
 
+FROM setup AS build-vcpkg-custom
+COPY . /home/project_options
+WORKDIR /home/project_options
+RUN git submodule update --init
+CMD ["/bin/bash", "-c", "task rpi4-vcpkg:build.cross.custom-toolchain"]
+
+FROM setup AS build-aarch64
+COPY . /home/project_options
+WORKDIR /home/project_options
+RUN git submodule update --init
+CMD ["/bin/bash", "-c", "task rpi4:build.cross.aarch64"]
 
 FROM setup AS test
 RUN apt-get update && apt-get install -y \
@@ -55,3 +66,14 @@ WORKDIR /home/project_options
 RUN git submodule update --init
 ENV QEMU_LD_PREFIX /usr/aarch64-linux-gnu
 CMD ["/bin/bash", "-c", "task rpi4:build.cross && qemu-aarch64 /home/project_options/tests/rpi4/build/Release/example"]
+
+
+FROM setup AS test-aarch64
+RUN apt-get update && apt-get install -y \
+    qemu-user \
+    && rm -rf /var/lib/apt/lists/*
+COPY . /home/project_options
+WORKDIR /home/project_options
+RUN git submodule update --init
+ENV QEMU_LD_PREFIX /usr/aarch64-linux-gnu
+CMD ["/bin/bash", "-c", "task rpi4:build.aarch64 && qemu-aarch64 /home/project_options/tests/rpi4/build/Release/example"]
diff --git a/docker/Dockerfile.arm b/docker/Dockerfile.arm
@@ -14,7 +14,7 @@ FROM base AS setup
 RUN setup-cpp --clangtidy true --clangformat true --cmake true --ninja true --ccache true --cppcheck true --vcpkg true --conan true --task true 
 
 RUN apt-get update && apt-get install -y \
-    gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi \
+    gcc-arm-linux-gnueabi g++-arm-linux-gnueabi gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
     && rm -rf /var/lib/apt/lists/*
 
 COPY ./docker/entrypoint.sh /docker-entrypoint.sh
@@ -32,4 +32,4 @@ FROM setup AS build-debug
 COPY . /home/project_options
 WORKDIR /home/project_options
 RUN git submodule update --init
-CMD ["/bin/bash", "-c", "task rpi3:build.cross.debug"]
+CMD ["/bin/bash", "-c", "task rpi3:build.cross.debug"]
diff --git a/docker/Dockerfile.arm-bare-metal b/docker/Dockerfile.arm-bare-metal
@@ -0,0 +1,27 @@
+FROM ubuntu:22.04 AS base
+
+# add setup-cpp https://github.com/aminya/setup-cpp
+RUN apt-get update && apt-get install -y \
+  npm \
+  && rm -rf /var/lib/apt/lists/*
+RUN npm install -g setup-cpp
+
+
+FROM base AS setup
+
+# install cmake, ninja, and ccache
+RUN setup-cpp --clangtidy true --clangformat true --cmake true --ninja true --ccache true --cppcheck true --vcpkg true --conan true --task true 
+
+RUN apt-get update && apt-get install -y \
+    gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY ./docker/entrypoint.sh /docker-entrypoint.sh
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+
+
+FROM setup AS build
+COPY . /home/project_options
+WORKDIR /home/project_options
+RUN git submodule update --init
+CMD ["/bin/bash", "-c", "task rpi3:build.cross.bare-metal"]
diff --git a/docker/Taskfile.yml b/docker/Taskfile.yml
@@ -49,3 +49,15 @@ tasks:
   rpi4.custom:
     - docker-compose up --build build-rpi4-custom
     - docker-compose down
+
+  rpi4.aarch64:
+    - docker-compose up --build build-rpi4-aarch64
+    - docker-compose down
+
+  rpi3.bare-metal:
+    - docker-compose up --build build-rpi3-bare-metal
+    - docker-compose down
+
+  rpi4.vcpkg-custsom:
+    - docker-compose up --build build-rpi4-vcpkg-custom
+    - docker-compose down