diff --git a/appveyor.yml b/appveyor.yml index d7e6e3d4..19993305 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -44,6 +44,8 @@ for: - windeployqt appdir\leocad.exe - copy tools\setup\leocad.nsi . - copy tools\setup\setup.ico . + - 'dir "%VCINSTALLDIR%Redist"' + - 'dir "%VCINSTALLDIR%Redist\MSVC\v143\"' - 'copy "%VCINSTALLDIR%Redist\MSVC\v143\vcredist_x64.exe" appdir' - '"C:\Program Files (x86)\NSIS\makensis.exe" /V4 /DX64 "/XOutFile LeoCAD-Windows-%VERSION%.exe" leocad.nsi' - set TRAVIS_TAG=%APPVEYOR_REPO_TAG_NAME% @@ -128,7 +130,7 @@ for: - macdeployqt LeoCAD.app -dmg - mv LeoCAD.dmg LeoCAD-macOS-$(git rev-parse --short HEAD).dmg - 'curl -s -H "Authorization: token $GITHUB_TOKEN" https://api.github.com/repos/leozide/leocad/commits/master -o repo.txt' - - 'export REMOTE=$(awk -F"\"" "/\"sha\"[[:space:]]*:/ { print $(NF-1); exit }" repo.txt)' + - 'export REMOTE=$(jq -r ''.sha'' repo.txt)' - export LOCAL=$(git rev-parse HEAD) - export UPLOADTOOL_ISPRERELEASE=1 - if [[ "$REMOTE" != "$LOCAL" ]]; then echo "Build no longer current. $REMOTE vs $LOCAL - aborting upload."; exit 0; fi;