Skip to content

Commit 70ec414

Browse files
committed
Modifications to support the new configs.
1 parent c8a5e1e commit 70ec414

File tree

7 files changed

+85
-1
lines changed

7 files changed

+85
-1
lines changed
File renamed without changes.

build/build-container.sh renamed to build/4.4.0/build-container.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ fi
1818

1919
echo "using ${TAG} -> ${BRANCH} (${REPO})"
2020

21-
docker build ./build -f build/Dockerfile --tag "betaflight/cloudbuild:${TAG}" --build-arg NOCACHE=$(date +%s) --build-arg COMMIT=${BRANCH} --build-arg REPO=${REPO}
21+
docker build ./build/4.4.0 -f build/4.4.0/Dockerfile --tag "betaflight/cloudbuild:${TAG}" --build-arg NOCACHE=$(date +%s) --build-arg COMMIT=${BRANCH} --build-arg REPO=${REPO}
File renamed without changes.

build/4.5.0/Dockerfile

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
FROM betaflight/cloudbuild:ARM10.3
2+
3+
ARG COMMIT="master"
4+
ARG REPO="https://github.com/betaflight/betaflight.git"
5+
6+
RUN echo "$REPO $COMMIT"
7+
8+
RUN git clone -b ${COMMIT} ${REPO} source
9+
10+
WORKDIR /source
11+
12+
RUN git checkout ${COMMIT}
13+
14+
ARG NOCACHE="1"
15+
16+
RUN git pull origin ${COMMIT}:${COMMIT}
17+
18+
RUN make configs
19+
20+
WORKDIR /build
21+
COPY build.sh .
22+
23+
RUN chmod +x ./build.sh

build/4.5.0/build-container.sh

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
BRANCH=$1
4+
TAG=$2
5+
REPO=$3
6+
7+
if [ -z "$BRANCH" ]; then
8+
BRANCH="master"
9+
fi
10+
11+
if [ -z "$TAG" ]; then
12+
TAG=${BRANCH}
13+
fi
14+
15+
if [ -z "$REPO" ]; then
16+
REPO="https://github.com/betaflight/betaflight.git"
17+
fi
18+
19+
echo "using ${TAG} -> ${BRANCH} (${REPO})"
20+
21+
docker build ./build/4.5.0 -f build/4.5.0/Dockerfile --tag "betaflight/cloudbuild:${TAG}" --build-arg NOCACHE=$(date +%s) --build-arg COMMIT=${BRANCH} --build-arg REPO=${REPO}

build/4.5.0/build.sh

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/bin/bash
2+
3+
COMMIT=$1
4+
TARGET=$2
5+
FLAGS=$3
6+
7+
echo ""
8+
echo "Pulling from Github (${COMMIT}):"
9+
10+
cd /source
11+
git fetch origin "${COMMIT}":CLOUD_HEAD || { echo "fetch failed with $?"; exit 1; }
12+
[ $? == 1 ] && exit 0;
13+
14+
echo ""
15+
echo "Checking out the branch -> CLOUD_HEAD (for ${COMMIT})"
16+
17+
cd /source
18+
git checkout -f CLOUD_HEAD || { echo "checkout failed with $?"; exit 1; }
19+
[ $? == 1 ] && exit 0;
20+
21+
echo ""
22+
echo "Commencing the build (make ${TARGET}):"
23+
24+
cd /source
25+
make configs || { echo "make configs failed with $?"; exit 1; }
26+
[ $? == 1 ] && exit 0;
27+
28+
cd /source
29+
make $TARGET EXTRA_FLAGS="${FLAGS}" || { echo "make failed with $?"; exit 1; }
30+
[ $? == 1 ] && exit 0;
31+
32+
echo ""
33+
34+
if [[ -d "/output" ]] ; then
35+
echo "Copying hex files (to output):"
36+
cp -v /source/obj/*.hex /output
37+
echo " -> completed"
38+
else
39+
echo "Skipping copying hex files (no output mount for container)"
40+
fi
File renamed without changes.

0 commit comments

Comments
 (0)