piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Still build firmware stamps even if .deb binary is already there

Browse Source
This commit is contained in:
3djc
2017-03-23 10:36:06 +01:00
parent a7050e4b51
commit 1856334e7e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/nightly22/build-nightly.sh
+5 -5
View File
@@ -27,15 +27,15 @@ docker rmi -f new-${docker}
code/tools/nightly22/build-sdcard.sh
# Build Linux companion
docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
docker exec companion rm -rf build
if [ ! -f ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb ]; then
docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
docker exec companion rm -rf build
docker exec companion /opentx/code/tools/build-companion.sh /opentx/code /opentx/binaries/ ${suffix}
docker stop companion
docker rm companion
cp -f binaries/*.deb ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb
fi
docker stop companion
docker rm companion
# Request companion compilation on Windows
if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe ]; then
tools/release22/build-release.sh
+5 -5
View File
@@ -21,16 +21,16 @@ docker rmi -f new-${docker}
code/tools/release22/build-sdcard.sh
# Build Linux companion
docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
docker exec companion rm -rf build
if [ ! -f ${output}/companion/linux/companion22_${version}${suffix}_amd64.deb ]; then
docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
docker exec companion rm -rf build
docker exec companion /opentx/code/tools/build-companion.sh /opentx/code /opentx/binaries/
docker stop companion
docker rm companion
cp -f binaries/*.deb ${output}/companion/linux/companion22_${version}_amd64.deb
cp -f binaries/radio/src/lua/lua_fields_*.txt ${output}/firmware
fi
docker stop companion
docker rm companion
# Request companion compilation on Windows
if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe ]; then