1
0
forked from me/IronOS

Merge pull request #533 from Ralim/codeship-update

Codeship update
Re-work the build script to keep temp files that can be kept
This commit is contained in:
Ben V. Brown
2019-12-26 11:31:54 +11:00
committed by GitHub
3 changed files with 15 additions and 17 deletions

View File

@@ -1,27 +1,21 @@
FROM ubuntu:rolling FROM ubuntu:rolling
MAINTAINER Ben V. Brown <ralim@ralimtek.com> LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
WORKDIR /build WORKDIR /build
# Setup the ARM GCC toolchain # Setup the ARM GCC toolchain
# Install any needed packages specified in requirements.txt # Install any needed packages specified in requirements.txt
RUN apt-get update && \ RUN apt-get update && \
apt-get upgrade -y && \ apt-get upgrade -y && \
apt-get install -y \ apt-get install -y \
make \ make \
git \ bzip2 \
bzip2 \ python3 \
git \ wget && \
golang \ apt-get clean && \
python3 \ wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 | tar -xj
wget && \
apt-get clean && \
wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 | tar -xj
# Add compiler to the path # Add compiler to the path
ENV PATH "/build/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH" ENV PATH "/build/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH"
# Get the github release tool
RUN go get -u github.com/aktau/github-release
COPY . /build/source COPY . /build/source
COPY ./ci /build/ci COPY ./ci /build/ci

View File

@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
docker-compose run --rm builder docker-compose run --rm builder

View File

@@ -145,7 +145,11 @@ then
echo "Building firmware for $model in $lang" echo "Building firmware for $model in $lang"
make -j lang="$lang" model="$model" >/dev/null make -j lang="$lang" model="$model" >/dev/null
checkLastCommand checkLastCommand
rm -rf Objects >/dev/null echo "Cleanup Temp files 1 for $model in $lang"
rm -rf Objects/Core >/dev/null
checkLastCommand
echo "Cleanup Temp files 2 for $model in $lang"
rm -rf Objects/Src >/dev/null
checkLastCommand checkLastCommand
done done
done done