Merge pull request #533 from Ralim/codeship-update

Codeship update
Re-work the build script to keep temp files that can be kept

3 files changed, 15 insertions, 17 deletions

diff --git a/Dockerfile b/Dockerfile
index 67f0a4b4..e9e9b6ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,27 +1,21 @@
 FROM ubuntu:rolling

-MAINTAINER Ben V. Brown <[email protected]>

+LABEL maintainer="Ben V. Brown <[email protected]>"

 

 WORKDIR /build

 # Setup the ARM GCC toolchain

 

 # Install any needed packages specified in requirements.txt

 RUN apt-get update && \

-    apt-get upgrade -y && \

-    apt-get install -y \

-      make \

-      git \

-      bzip2 \

-	    git \

-	    golang \

-      python3 \

-      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

+  apt-get upgrade -y && \

+  apt-get install -y \

+  make \

+  bzip2 \

+  python3 \

+  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

-

 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 ./ci /build/ci

diff --git a/start_dev.sh b/start_dev.sh
index 2f1dda40..8f7bebc9 100755
--- a/start_dev.sh
+++ b/start_dev.sh
@@ -1,2 +1,2 @@
-#!/usr/bin/env bash

+#!/usr/bin/env bash
 docker-compose run --rm builder
\ No newline at end of file
diff --git a/workspace/TS100/build.sh b/workspace/TS100/build.sh
index 75a4a2d1..7bfff64d 100755
--- a/workspace/TS100/build.sh
+++ b/workspace/TS100/build.sh
@@ -145,7 +145,11 @@ then
             echo "Building firmware for $model in $lang"
             make -j lang="$lang" model="$model" >/dev/null
             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
         done
     done