Suffix handling for RC builds
This commit is contained in:
@@ -17,7 +17,7 @@ cd ${workdir}
|
|||||||
|
|
||||||
# Create on-demand build environment
|
# Create on-demand build environment
|
||||||
cp code/radio/util/Dockerfile .
|
cp code/radio/util/Dockerfile .
|
||||||
docker build -t new-${docker} .
|
docker build -t new-${docker} --build-arg OPENTX_VERSION_SUFFIX=${suffix} .
|
||||||
set +e
|
set +e
|
||||||
docker rmi -f ${docker}
|
docker rmi -f ${docker}
|
||||||
set -e
|
set -e
|
||||||
@@ -43,17 +43,17 @@ docker rm companion
|
|||||||
# Request companion compilation on Windows
|
# Request companion compilation on Windows
|
||||||
if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe ]; then
|
if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe ]; then
|
||||||
cd ${output}/companion/windows
|
cd ${output}/companion/windows
|
||||||
wget -qO- http://winbox.open-tx.org/companion-builds/compile22.php?branch=${branch}
|
wget -qO- http://winbox.open-tx.org/companion-builds/compile22.php?branch=$branch\&suffix=${suffix}
|
||||||
wget -O companion-windows-${version}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${version}.exe
|
wget -O companion-windows-${version}${suffix}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${version}${suffix}.exe
|
||||||
chmod -f g+w companion-windows-${version}.exe
|
chmod -Rf g+w companion-windows-${version}${suffix}.exe
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Request companion compilation on Mac OS X
|
# Request companion compilation on Mac OS X
|
||||||
if [ ! -f ${output}/companion/macosx/opentx-companion-${version}${suffix}.dmg ]; then
|
if [ ! -f ${output}/companion/macosx/opentx-companion-${version}${suffix}.dmg ]; then
|
||||||
cd ${output}/companion/macosx
|
cd ${output}/companion/macosx
|
||||||
wget -qO- http://opentx.blinkt.de:8080/~opentx/build-opentx.py?branch=${branch}
|
wget -qO- http://opentx.blinkt.de:8080/~opentx/build-opentx.py?branch=${branch}\&suffix=${suffix}
|
||||||
wget -O opentx-companion-${version}.dmg http://opentx.blinkt.de:8080/~opentx/builds/opentx-companion-${version}.dmg
|
wget -O opentx-companion-${version}${suffix}.dmg http://opentx.blinkt.de:8080/~opentx/builds/opentx-companion-${version}${suffix}.dmg
|
||||||
chmod -f g+w opentx-companion-${version}.dmg
|
chmod -Rf g+w opentx-companion-${version}${suffix}.dmg
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Update stamps
|
# Update stamps
|
||||||
|
|||||||
Reference in New Issue
Block a user