Skip to content

Commit 95527d8

Browse files
committed
[ci] Some fixes
* Add tag for docker images * Remove build of musl toolchains in lvgl 64b * Use the new docker images for build workflows Signed-off-by: Jean-Pierre Miceli <jean-pierre.miceli@heig-vd.ch>
1 parent 02e00a0 commit 95527d8

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Build
2626
run: |
27-
docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "cd so3 && make ${{ matrix.CONFIG }} && make -j`nproc`"
27+
docker run --rm -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:latest bash -c "cd so3 && make ${{ matrix.CONFIG }} && make -j`nproc`"
2828
2929
build-usr:
3030
runs-on: ubuntu-latest
@@ -42,4 +42,4 @@ jobs:
4242

4343
- name: Build
4444
run: |
45-
docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:main bash -c "mkdir usr/build && cd usr/build && cmake --no-warn-unused-cli -DCMAKE_C_FLAGS='-Werror' -Wno-dev -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=../${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`"
45+
docker run --rm -t -v "${PWD}:/so3" ghcr.io/smartobjectoriented/so3-env:latest bash -c "mkdir usr/build && cd usr/build && cmake --no-warn-unused-cli -DCMAKE_C_FLAGS='-Werror' -Wno-dev -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DCMAKE_TOOLCHAIN_FILE=../${{matrix.CMAKE_TOOLCHAIN_FILE }} .. && make -j`nproc`"

.github/workflows/docker.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
images: ghcr.io/smartobjectoriented/so3-toolchains
4040
tags: |
4141
type=raw,value=latest
42-
type=sha
4342
4443
- name: Set up Docker Buildx
4544
uses: docker/setup-buildx-action@v3
@@ -97,6 +96,8 @@ jobs:
9796
uses: docker/metadata-action@v5
9897
with:
9998
images: ${{ matrix.image }}
99+
tags: |
100+
type=raw,value=latest
100101
101102
- name: Set up Docker Buildx
102103
uses: docker/setup-buildx-action@v3

docker/Dockerfile.lvperf_64b

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ COPY --from=builder /so3/u-boot/u-boot u-boot
6262

6363
COPY u-boot/uEnv.d u-boot/uEnv.d
6464

65-
COPY toolchains /toolchains
66-
RUN /toolchains/build-toolchain.sh && rm -rf /toolchains/musl-cross-make
67-
ENV PATH=$PATH:/toolchains/aarch64-linux-musl/bin
68-
ENV PATH=$PATH:/toolchains/arm-linux-musleabihf/bin
69-
7065
RUN mkdir target
7166
RUN mkdir -p usr
7267
RUN mkdir -p docker/scripts

0 commit comments

Comments
 (0)