Move ordering of build script

Don't build Docker first; build it last. Build NuGet packages later as
well so build failures don't need repeated comments to "fix".
This commit is contained in:
Joshua M. Boniface 2019-11-24 16:09:07 -05:00
parent 7ddd9699a0
commit e8717fbd91

View File

@ -51,15 +51,12 @@ dotnet restore --no-cache
popd
echo "*** BUILDING NUGET PACKAGES ***"
/bin/bash ${builddir}/scripts/build.d/build-jellyfin-nuget
echo "*** BUILDING DOCKER IMAGES ***"
/bin/bash ${builddir}/scripts/build.d/build-jellyfin-docker tag-name=${tagname} build-docker-manifests=yes
echo "*** BUILDING OS PACKAGES ***"
./build ${reponame}
echo "*** BUILDING NUGET PACKAGES ***"
/bin/bash ${builddir}/scripts/build.d/build-jellyfin-nuget
echo "*** GRABBING WINDOWS INSTALLER FROM AZURE ***"
installer_tmpdir="$( mktemp -d )"
azure_build_id="$( az pipelines runs list --branch release-10.4.z --pipeline-ids 1 --reason batchedCI --result succeeded --status completed --query-order QueueTimeDesc --top 1 | jq '.[].id' )"
@ -75,6 +72,9 @@ rsync -avz bin/${reponame}/ build@${reposerver}:/srv/incoming/${reponame}_${tagn
echo "*** COLLECTING PACKAGES FOR REPO ***"
ssh build@${reposerver} "sudo /srv/collect-server.sh /srv/incoming/${reponame}_${tagname}"
echo "*** BUILDING DOCKER IMAGES ***"
/bin/bash ${builddir}/scripts/build.d/build-jellyfin-docker tag-name=${tagname} build-docker-manifests=yes
echo "*** UPLOADING BINARIES TO GITHUB RELEASE ***"
for dir in bin/${reponame}/*; do
artifact_dir="$( awk -F'/' '{ print $NF }' <<<"${dir}" )"