Reverse last commit, modify some ordering here

This commit is contained in:
Joshua Boniface 2020-03-22 20:22:57 -04:00
parent 937fc7e463
commit 94d7a260d6

View File

@ -50,47 +50,41 @@ git submodule update --init || true
popd
#echo "*** BUILDING OS PACKAGES ***"
#platforms=(
# debian-package-x64 debian-package-arm64 debian-package-armhf
# ubuntu-package-x64 ubuntu-package-arm64 ubuntu-package-armhf
# fedora-package-x64
# centos-package-x64
# linux-x64
# win-x64
# win-x86
# portable
# macos
#)
#for platform in ${platforms[@]}; do
# ./build ${reponame} ${platform} &>${builddir}/logs/${platform}.log
# if [[ $? -gt 0 ]]; then
# echo "FAILED TO BUILD PLATFORM ${platform}"
# else
# echo "OK ${platform}"
# fi
#done
#
#echo "*** GRABBING WINDOWS INSTALLER FROM AZURE ***"
#installer_tmpdir="$( mktemp -d )"
#azure_build_id="$( az pipelines runs list --branch release-10.5.z --pipeline-ids 1 --reason batchedCI --result succeeded --status completed --query-order QueueTimeDesc --top 1 | jq '.[].id' )"
#az pipelines runs artifact download --artifact-name 'Jellyfin Server Setup' --path ${installer_tmpdir} --run-id ${azure_build_id} && \
#mkdir -p bin/jellyfin/win-installer && \
#mmv "${installer_tmpdir}/jellyfin_*_windows-*.exe" "bin/jellyfin/win-installer/jellyfin_${tagname}-#2.exe" && \
#rm -rf ${installer_tmpdir} || \
#echo "FAILED TO GRAB A WINDOWS EXE, FIX THIS MANUALLY PL0X."
#
#echo "*** SYNCING OS PACKAGES TO REPO ***"
#rsync -avz bin/${reponame}/ ${repodir}/incoming/${reponame}_${tagname}
#
#echo "*** COLLECTING PACKAGES FOR REPO ***"
#sudo ${repodir}/collect-server.sh ${repodir}/incoming/${reponame}_${tagname}
#
#echo "*** CLEAN UP DOCKER IMAGES ***"
#docker image rm -f $( docker images -aq ) || true
echo "*** BUILDING OS PACKAGES ***"
platforms=(
debian-package-x64 debian-package-arm64 debian-package-armhf
ubuntu-package-x64 ubuntu-package-arm64 ubuntu-package-armhf
fedora-package-x64
centos-package-x64
linux-x64
win-x64
win-x86
portable
macos
)
for platform in ${platforms[@]}; do
./build ${reponame} ${platform} &>${builddir}/logs/${platform}.log
if [[ $? -gt 0 ]]; then
echo "FAILED TO BUILD PLATFORM ${platform}"
else
echo "OK ${platform}"
fi
done
echo "*** BUILDING DOCKER IMAGES ***"
/bin/bash ${builddir}/scripts/build.d/build-jellyfin-docker tag-name=${tagname} build-docker-manifests=yes
echo "*** GRABBING WINDOWS INSTALLER FROM AZURE ***"
installer_tmpdir="$( mktemp -d )"
azure_build_id="$( az pipelines runs list --branch release-10.5.z --pipeline-ids 1 --reason batchedCI --result succeeded --status completed --query-order QueueTimeDesc --top 1 | jq '.[].id' )"
az pipelines runs artifact download --artifact-name 'Jellyfin Server Setup' --path ${installer_tmpdir} --run-id ${azure_build_id} && \
mkdir -p bin/jellyfin/win-installer && \
mmv "${installer_tmpdir}/jellyfin_*_windows-*.exe" "bin/jellyfin/win-installer/jellyfin_${tagname}-#2.exe" && \
rm -rf ${installer_tmpdir} || \
echo "FAILED TO GRAB A WINDOWS EXE, FIX THIS MANUALLY PL0X."
echo "*** SYNCING OS PACKAGES TO REPO ***"
rsync -avz bin/${reponame}/ ${repodir}/incoming/${reponame}_${tagname}
echo "*** COLLECTING PACKAGES FOR REPO ***"
sudo ${repodir}/collect-server.sh ${repodir}/incoming/${reponame}_${tagname}
echo "*** UPLOADING BINARIES TO GITHUB RELEASE ***"
for dir in bin/${reponame}/*; do
@ -137,6 +131,12 @@ for dir in bin/${reponame}/*; do
rm -r ${temp_dir}
done
echo "*** CLEAN UP DOCKER IMAGE ARTIFACTS ***"
docker image rm -f $( docker images -aq ) || true
echo "*** BUILDING DOCKER IMAGES ***"
/bin/bash ${builddir}/scripts/build.d/build-jellyfin-docker tag-name=${tagname} build-docker-manifests=yes
echo "*** BUILDING NUGET PACKAGES ***"
/bin/bash ${builddir}/scripts/build.d/build-jellyfin-nuget