Replace /build/source by /build/ironos to eliminate ambiguity with /build/source/source (#1748)
* docker/buildAll.sh: replace /build/source by /build/ironos to eliminate ambiguity with /build/source/source * scripts/ci/buildAll.sh: fix shellcheck and add additional comment
This commit is contained in:
2
Env.yml
2
Env.yml
@@ -10,4 +10,4 @@ services:
|
|||||||
command: /bin/sh
|
command: /bin/sh
|
||||||
volumes:
|
volumes:
|
||||||
- ./scripts/ci:/build/ci:Z
|
- ./scripts/ci:/build/ci:Z
|
||||||
- ./:/build/source:Z
|
- ./:/build/ironos:Z
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ FROM alpine:3.16
|
|||||||
LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
|
LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
|
||||||
|
|
||||||
# Default current dir when container starts
|
# Default current dir when container starts
|
||||||
WORKDIR /build/source
|
WORKDIR /build/ironos
|
||||||
|
|
||||||
# Installing the two compilers (ARM & RISCV), python3 & pip, clang tools:
|
# Installing the two compilers (ARM & RISCV), python3 & pip, clang tools:
|
||||||
## - compilers: gcc-*, newlib-*
|
## - compilers: gcc-*, newlib-*
|
||||||
@@ -29,7 +29,7 @@ RUN apk add --no-cache ${APK_COMPS} ${APK_PYTHON} ${APK_MISC} ${APK_DEV}
|
|||||||
RUN python3 -m pip install ${PIP_PKGS}
|
RUN python3 -m pip install ${PIP_PKGS}
|
||||||
|
|
||||||
# Git trust to avoid related warning
|
# Git trust to avoid related warning
|
||||||
RUN git config --global --add safe.directory /build/source
|
RUN git config --global --add safe.directory /build/ironos
|
||||||
|
|
||||||
COPY . /build/source
|
COPY . /build/ironos
|
||||||
COPY ./scripts/ci /build/ci
|
COPY ./scripts/ci /build/ci
|
||||||
|
|||||||
@@ -2,12 +2,20 @@
|
|||||||
set -e
|
set -e
|
||||||
set -u
|
set -u
|
||||||
|
|
||||||
mkdir -p /build/ci/artefacts
|
# Init vars
|
||||||
|
dir_ci="/build/ci"
|
||||||
|
dir_ironos="/build/ironos"
|
||||||
|
dir_source="${dir_ironos}/source"
|
||||||
|
|
||||||
# Build STM code
|
# Prepare output dir
|
||||||
cd /build/source/source/
|
dir_artefacts="${dir_ci}/artefacts"
|
||||||
|
mkdir -p "${dir_artefacts}"
|
||||||
|
|
||||||
|
# Build firmware
|
||||||
|
cd "${dir_source}"
|
||||||
bash ./build.sh || exit 1
|
bash ./build.sh || exit 1
|
||||||
echo "All Firmware built"
|
echo "All Firmware built"
|
||||||
|
|
||||||
# Copy out all the final resulting files we would like to store for the next op
|
# Copy out all the final resulting files we would like to store for the next op
|
||||||
cp -r /build/source/source/Hexfile/*.hex /build/ci/artefacts/
|
cp -r "${dir_source}"/Hexfile/*.bin "${dir_artefacts}"
|
||||||
cp -r /build/source/source/Hexfile/*.bin /build/ci/artefacts/
|
cp -r "${dir_source}"/Hexfile/*.hex "${dir_artefacts}"
|
||||||
|
|||||||
Reference in New Issue
Block a user