commit 01bdd950aaa809594ee2d03834f53d1b520383ba parent 317d71654e457854ba1ba3657424b1687ff5a97b Author: Andrew Alderwick <andrew@alderwick.co.uk> Date: Thu, 14 Oct 2021 23:38:29 +0100 Added --no-run switch for automated builds This saves having to run sed to edit the build script, and stops piano.rom (and piano.log) from being bundled with the binary outputs. Diffstat:
| M | .build.yml | | | 7 | +++---- |
| M | build.sh | | | 2 | ++ |
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.build.yml b/.build.yml @@ -22,16 +22,15 @@ tasks: printf 'User build\nStrictHostKeyChecking yes\nCheckHostIP no\nHost win\nHostName w1.uxn-build.ald.nu\nPort 2222\nHost mac\nHostName m1.uxn-build.ald.nu\nPort 2223\n' > ~/.ssh/config - build-linux: | cd uxn - sed -i -e 's/.*Running.*/exit/' build.sh - ./build.sh + ./build.sh --no-run mv bin uxn tar -czf ../out/uxn-linux-amd64.tar.gz uxn cd .. - build-windows: | - ssh win "rm -f uxn-windows-64bit.zip; export PATH=\"\${PATH}:/mingw64/bin\"; set -ex; cd uxn; git fetch; git checkout .; git clean -xfd; git checkout $(cd uxn && git rev-parse HEAD); sed -i -e 's/.*Running.*/exit/' build.sh; MSYSTEM=MSYS ./build.sh; mv bin uxn; zip -qr ../uxn-windows-64bit.zip uxn" + ssh win "rm -f uxn-windows-64bit.zip; export PATH=\"\${PATH}:/mingw64/bin\"; set -ex; cd uxn; git fetch; git checkout .; git clean -xfd; git checkout $(cd uxn && git rev-parse HEAD); MSYSTEM=MSYS ./build.sh --no-run; mv bin uxn; zip -qr ../uxn-windows-64bit.zip uxn" rsync win:uxn-windows-64bit.zip out/ - build-macos: | - ssh mac "rm -f uxn-macos.tar.gz; export PATH=\"\${PATH}:/usr/local/bin\"; set -ex; cd uxn; git fetch; git checkout .; git clean -xfd; git checkout $(cd uxn && git rev-parse HEAD); sed -i -e 's/.*Running.*/exit/' build.sh; ./build.sh; mv bin uxn; tar -zcf ../uxn-macos.tar.gz uxn" + ssh mac "rm -f uxn-macos.tar.gz; export PATH=\"\${PATH}:/usr/local/bin\"; set -ex; cd uxn; git fetch; git checkout .; git clean -xfd; git checkout $(cd uxn && git rev-parse HEAD); ./build.sh --no-run; mv bin uxn; tar -zcf ../uxn-macos.tar.gz uxn" rsync mac:uxn-macos.tar.gz out/ - upload: | ls -l out diff --git a/build.sh b/build.sh @@ -64,6 +64,8 @@ fi echo "Assembling(asma).." ./bin/uxnasm projects/software/asma.tal bin/asma.rom +if [ "${1}" = '--no-run' ]; then exit; fi + echo "Assembling(piano).." bin/uxncli bin/asma.rom projects/examples/demos/piano.tal bin/piano.rom 2> bin/piano.log