From a68e2b9ffea80d0ce7b95ea12ab778b8c2c08761 Mon Sep 17 00:00:00 2001 From: Dmitry Ivanov Date: Mon, 17 Apr 2023 23:21:53 +0300 Subject: [PATCH] Issue #171: attempt to fix checkout for build-with-docker.sh --- development/build-with-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development/build-with-docker.sh b/development/build-with-docker.sh index e1d561e2..76d5b381 100755 --- a/development/build-with-docker.sh +++ b/development/build-with-docker.sh @@ -49,7 +49,7 @@ time docker run \ -v $PROJECTDIR/docker-build-${BUILD_TYPE}:/opt/nixnote2/qmake-build-${BUILD_TYPE} \ -v $PROJECTDIR/docker-build-${BUILD_TYPE}-t:/opt/nixnote2/qmake-build-${BUILD_TYPE}-t \ -it ${DOCKERTAG} \ - /bin/bash -c "cd nixnote2 && git fetch && git checkout $PROJECTBRANCH && git reset --hard origin/$PROJECTBRANCH && ./development/build-with-qmake.sh ${BUILD_TYPE} noclean /usr/lib/nixnote2/tidy browser && ./development/run-tests.sh ${BUILD_TYPE} noclean /usr/lib/nixnote2/tidy && ./development/create-AppImage-linuxdeploy.sh && mv *.AppImage appdir && chmod -R a+rwx appdir/*.AppImage" + /bin/bash -c "cd nixnote2 && git fetch && git checkout --track origin/$PROJECTBRANCH && git reset --hard origin/$PROJECTBRANCH && ./development/build-with-qmake.sh ${BUILD_TYPE} noclean /usr/lib/nixnote2/tidy browser && ./development/run-tests.sh ${BUILD_TYPE} noclean /usr/lib/nixnote2/tidy && ./development/create-AppImage-linuxdeploy.sh && mv *.AppImage appdir && chmod -R a+rwx appdir/*.AppImage" ls appdir/*.AppImage echo "If all got well then AppImage file in appdir is your binary"