Skip to content

Commit 8a65664

Browse files
committed
[CI] Add toolchains dependency for usr build
Signed-off-by: Jean-Pierre Miceli <jean-pierre.miceli@heig-vd.ch>
1 parent fd9fc92 commit 8a65664

5 files changed

Lines changed: 18 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ on:
66
- main
77
pull_request:
88
branches: ["main", "144-support-musl"]
9+
workflow_run:
10+
workflows: ["Docker Image CI"]
11+
types: [completed]
912

1013
jobs:
1114
build-so3:
15+
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1216
runs-on: ubuntu-latest
1317
strategy:
1418
fail-fast: false
@@ -27,6 +31,7 @@ jobs:
2731
docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd so3 && make ${{ matrix.CONFIG }} && make -j`nproc`"
2832
2933
build-usr:
34+
if: ${{ github.event.workflow_run.conclusion == 'success' }}
3035
runs-on: ubuntu-latest
3136
strategy:
3237
fail-fast: false

docker/Dockerfile.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN apt install git -y
2323
RUN apt install cmake -y
2424
RUN apt install python3-pip -y
2525

26-
RUN pip3 install pcpp
26+
RUN pip install --break-system-packages pcpp
2727

2828
# Get current so3 so we can build qemu
2929
RUN wget https://github.com/smartobjectoriented/so3/archive/refs/heads/main.zip

docker/Dockerfile.lvperf_32b

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ FROM ghcr.io/smartobjectoriented/so3-toolchains:latest AS baseimage
22

33
FROM baseimage AS builder
44

5-
RUN apk update; \
6-
apk add --no-cache make cmake gcc-arm-none-eabi \
7-
g++-arm-none-eabi qemu-system-arm \
8-
bison flex libc-dev libressl-dev dtc
5+
RUN apt update && \
6+
apt install -y build-essential cmake qemu-system-arm gcc-arm-none-eabi \
7+
bison flex libssl-dev device-tree-compiler qemu-system-arm g++-arm-none-eabi && \
8+
apt clean && \
9+
rm -rf /var/lib/apt/lists/*
910

1011
WORKDIR /so3
1112

docker/Dockerfile.lvperf_64b

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
FROM ghcr.io/smartobjectoriented/so3-toolchains:latest AS baseimage
22

3+
ENV DEBIAN_FRONTEND=noninteractive
4+
ENV TZ=UTC
5+
36
FROM baseimage AS builder
47

58
RUN apt update && \

docker/Dockerfile.toolchains

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Create a Docker image which prepare the toolchains needed by SO3 env.
22
#
33
# Copyright (c) 2025 REDS Institute, HEIG-VD
4+
#
5+
# Set 'aarch64-none-elf' toolchain & build arm & aarch64 musl toolchains
6+
#
7+
# Note: 'arm-none-eabi-' is installed for package manager in the others docker images
48

59
FROM ubuntu:24.04 AS toolchains-utils
610

0 commit comments

Comments
 (0)