From 6522c42c6856eed0e9f4d61df6504fe63cc55721 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Mon, 18 Mar 2024 20:24:55 -0500 Subject: [PATCH 01/22] Updating these windows dependencies to use the "cp311" version for Python 3.11 instead of "cp37m" for Python 3.7 --- build/deps/download.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/deps/download.sh b/build/deps/download.sh index 21bccf32..1477c426 100755 --- a/build/deps/download.sh +++ b/build/deps/download.sh @@ -45,13 +45,13 @@ ${PYTHON} -m pip install --upgrade pip==24.0 ${PYTHON} -m pip download --no-cache-dir kivy==2.3.0 pyinstaller==6.5.0 altgraph==0.17.4 macholib==1.16.3 future==1.0.0 pefile==2023.2.7 pywin32-ctypes==0.2.2 setuptools==69.1.1 wheel==0.42.0 virtualenv==20.25.1 # pip (platform-specific binaries/wheels) -${WGET} `${CURL} -s https://pypi.org/simple/kivy/ | grep -oE 'https://.*Kivy-2.30-cp37-cp37m-win_amd64.whl#'` +${WGET} `${CURL} -s https://pypi.org/simple/kivy/ | grep -oE 'https://.*Kivy-2.30-cp312-cp312-win_amd64.whl#'` ${WGET} `${CURL} -s https://pypi.org/simple/kivy/ | grep -oE 'https://.*Kivy-2.3.0-cp37-cp37m-macosx_10_9_x86_64.whl#'` ${WGET} `${CURL} -s https://pypi.org/simple/pypiwin32/ | grep -oE 'https://.*pypiwin32-223-py3-none-any.whl#'` -${WGET} `${CURL} -s https://pypi.org/simple/pywin32/ | grep -oE 'https://.*pywin32-306-cp37-cp37m-win_amd64.whl#'` -${WGET} `${CURL} -s https://pypi.org/simple/kivy-deps-sdl2/ | grep -oE 'https://.*kivy_deps.sdl2-0.7.0-cp37-cp37m-win_amd64.whl#'` -${WGET} `${CURL} -s https://pypi.org/simple/kivy-deps-glew/ | grep -oE 'https://.*kivy_deps.glew-0.3.1-cp37-cp37m-win_amd64.whl#'` -${WGET} `${CURL} -s https://pypi.org/simple/kivy-deps-angle/ | grep -oE 'https://.*kivy_deps.angle-0.4.0-cp37-cp37m-win_amd64.whl#'` +${WGET} `${CURL} -s https://pypi.org/simple/pywin32/ | grep -oE 'https://.*pywin32-306-cp312-cp312-win_amd64.whl#'` +${WGET} `${CURL} -s https://pypi.org/simple/kivy-deps-sdl2/ | grep -oE 'https://.*kivy_deps.sdl2-0.7.0-cp312-cp312-win_amd64.whl#'` +${WGET} `${CURL} -s https://pypi.org/simple/kivy-deps-glew/ | grep -oE 'https://.*kivy_deps.glew-0.3.1-cp312-cp312-win_amd64.whl#'` +${WGET} `${CURL} -s https://pypi.org/simple/kivy-deps-angle/ | grep -oE 'https://.*kivy_deps.angle-0.4.0-cp312-cp312-win_amd64.whl#'` # misc linux ${WGET} https://github.com/niess/python-appimage/releases/download/python3.12/python3.12.2-cp312-cp312-manylinux2014_x86_64.AppImage From 7ddd7662e2f542749cb89a720ffdd76800d40e3a Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Thu, 21 Mar 2024 21:20:03 -0500 Subject: [PATCH 02/22] adding warning to update docker public keys when changing the docker image For more info, see: * https://github.com/BusKill/buskill-app/issues/78#issuecomment-2014192683 --- build/linux/debianWrapper.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/linux/debianWrapper.sh b/build/linux/debianWrapper.sh index b9ecdddd..7fefe55d 100755 --- a/build/linux/debianWrapper.sh +++ b/build/linux/debianWrapper.sh @@ -18,6 +18,10 @@ set -x # SETTINGS # ############ +# WARNING: If you update this then you *must* update build/deps/docker.io +# If you do not update ^ this, then docker will happily download +# malicious code that could be used to poison our builds! +# * https://security.stackexchange.com/q/238916/213165 DOCKER_IMAGE_NAME='debian:bookworm-slim' ################# From 6744e8bb480bed2b94a89edb0c7d964d6f2a8862 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Fri, 22 Mar 2024 12:35:01 -0500 Subject: [PATCH 03/22] attempting to switch dependencies to buskill-app-deps repo in linux builds * https://github.com/BusKill/buskill-app/issues/24 --- build/deps/buskill.asc | 106 ++++++++++++++++++++++++++++++++++ build/deps/python-windows.asc | 53 +++++++++++++++++ build/linux/buildAppImage.sh | 40 ++++++++++++- 3 files changed, 197 insertions(+), 2 deletions(-) create mode 100644 build/deps/buskill.asc create mode 100644 build/deps/python-windows.asc diff --git a/build/deps/buskill.asc b/build/deps/buskill.asc new file mode 100644 index 00000000..0e7b6670 --- /dev/null +++ b/build/deps/buskill.asc @@ -0,0 +1,106 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBF8EzWUBEADB6i1K7/TSr8ivgxAWWA7usOjeCDzYjmhG5FWtp3uU68vtMB77 +BwyzcACBfEMF+k2jgfE+KRwdIlsJXJXPmq5yRZHopMDUsrPTLs0KJ3vZkZl1z5Hu +AkrK//VEFIRy8JzQiB+tih+kbToU/cTVjnsf8R0sa+/gmreshjE+85X3Y6sEV7HC +19l/+9HvT+lD6ahagwyP8f/149xWM7h63L+t37TgaYuYt+CdyLfeEZmNLkIf+P/K +qZMTocsQoNYrBkB9OVR0W2wusdqkNETIzuvLyCFDG6YCGhztsvCOp/YqlPfmBMP+ +0v6P7/Acq+99dLP7ca3XK3EwR7nKwH5Wlbb9FAB2gHiRlQRxqPelT6apZU7D9c19 +gz7fRdkZFHvdipBZZMMfoamP0kHpr8WJdxe7Sw4LUpg3wzNFEf54VKakUZX+EDUA +e2e2AbVnW3CH6FE1Acm7AnyQddaudzGUskktoPWSK3aij/+heCbjADUxclR6B9GW +uWHHsHVd/lvt+QvEpWhGqbth7YjlDLF7nPbqZWNVWvzQYllcbcCD08Ojj7BfEv/+ +I2oKDpR1sLLs+aQAn/isZ6YBM3xp1feamN1eqdJlG/NsmUk22X+08fAWG9XFszpH +AuNWuMGfG5KYsUY3e3H3/IfW2hTOmAoTmdGpBZrcylvHXPsh4i3Wwtc7EQARAQAB +tDpCdXNLaWxsIFJlbGVhc2VzIFNpZ25pbmcgS2V5IDIwMjAuMDcgPHJlbGVhc2Vz +QGJ1c2tpbGwuaW4+iQI+BBMBAgAoBQJfBM1lAhsDBQkJZgGABgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBK4h4ZNs54aoHZEACAiEVwuyNQNuBmsRb+TtOoeh0G +FPREYO7dkYevzqGGwzFDQ6d8baqgXZ6H2zaXU1n+RUekq1C/APmpkVpjlcXSQ1bO +B+yQBrzHjYy2wpEmHjK1wGs8xNRMf0I3RTwZK0Vo3/yKBMMtk5XVvKI/yIIVUmvS +Upx28EOb+ofQL6YyX0xEtm5YP5p7/Bx/JobNVy7oLrQVILI9DlU3Sf1IRQdRZZkq +jwJECE50Q0dgTCUsF84eYsbw/mfQCaquCsIH/pd5HnjA6LFjiUYaMmSmH+yKt1yD +BEEVt+z2zLCM/rcW/iw06F3WlTNI22LVR18Yd8guqpw6AtG+BDVxzucoF8w4oWis +AYnAsHagmyTLSHMvubRWkHUXT6FNpO6V/xdKlG59Hqm49rSEB/0e+jhGV1ViVyQ6 +VEH8kXcSbAkeDwuWgwHYWt2I0C/JBhAe+YE4PtAQ0ES3b7u4PEkFD+EkXY3uxqTc +X4LAsYQzsbgkodItvi/+TaEus+md+1CoCm05SBbFyjgiLytAz77Y3J5z4ll5CmSz +mgQrtH9nAKGynmp7kp/xyzkW4WxEkQQkqfRgGNpaONKmtEkiAyjsknyjWyidR1PC +p46wAMaebMDmIR1pCru6c4VCBDO0B+QZwfeND8hSibubRXzo76/JGmbQGID/qwD3 +yaU8FZmKAZzXXb02bIkBswQQAQoAHRYhBAU/swPQm9M4qVypk3iBoDbyHBX4BQJf +BNOlAAoJEHiBoDbyHBX4OQQMANK8aMsgKfekl7pC7IkZOIwQZCo4t7W6Vykw3nAV +aikXxtZt6Wkrnw9q+xG1XjFJ3jvSkfmfbW3HYtZYG1CILyUzMGWRQ3ceQcnfSXBZ +klldt3pcw2Gx2gZ5zNPC7VgSuGbGRmplKTtZ+rG/+5h8q+DrXP1hj0DN4GRuNpi6 +3CC7KHyPvrMsuq7QkWTPz7zPvh0z5PDs9neV6zsOUskKQ6aMrbBLKx+b/cEizOaO +0JHBnFUKkbCCNUjhK1kz/Rp/wjIkHy5NjYNpBcToHTkb3LUkVAP3YOLZdhhTcpih +wnDfFS2O7ssA+1zAS7OI3QSRmUpz/+cm9fxCkCym0f9fEtIzi8/yOl45OcstfoSU +em05NQF/YVW01QP3Bx5pBLIVHnQepjXxpx/J2BLwSI1t4JaSCD02QrozcM++1sYh +jfuLOctuvFrHReEZ2zIPjp3GvbShtwUMiW2ihCPSohzO3xw7PEjOzoEOvZWvmKzj +u+qA/9ZNed0taEPlDIs2veLLF4kCMwQQAQoAHRYhBARl5C9xIGeF6XJkTP4bhElO +ZA1BBQJfBNPjAAoJEP4bhElOZA1Bft8QAKBg7V8rRq5ddyaiAVmVdYDaJdSh0AS7 +FJKblc/ee+2a6AjY9c/XElYyjtHiMO1xun1tEQh7wNIpwyb7z6NVRsQTDhXHt1ep +GeMhsBJK5D4vH9Xf/RItvpC670tq31b/OGgzMv+dDtNFg3FEYjJ2ImX0g4opCe9/ +9cj0s8KmCKAMUNNSPiThXc9TzmNOybaPzDZuxsmMkpQlbvUFGaswRkyFINRq6pzh +brqqO6Krt57jvjHHQtoVENsQCC9PhaYp60p3GuigTxB0k02mi9pOhwOvskFGBywy +n3agTlWyb3PLbx+PPJio4LGe7McHEW+OgnK59fiwflCAzRsZupXnwh5ebxWiyw1B +BCj6wuKMr8Guf2CF3j//XsclrvbcIi8iNuYa6TiBKWgv2U6nEbXgoSwOgktCGsUh +A3xB5oMzn+SdnWk1nlYssnieO2s7Cz3gzbYl/ZNwdfP7Fb2l2pOcbaSMQSjc7D+t +A2JF3o4YhUCEBbjfQT0tFdi575Gk1WcHmRK6GGnAJ2Ki160hz4s+sm9MdwrRzi58 +TR4yLyecjE3yAK4Q6/joLhZHpxaa7FmBvvL+Ry3HP90ypKufTslIsNWNL4p/4R+r +mG77Yp2tIEE9oY1rASjjOHcHLKMkNYdsq/YWBsESC28uw0WgGIfgExlLGRxK7wUG +RERpPvHi3tD+uQINBF8EzWUBEADA+QoxtW3klLSBPKX/Zm0GMvCOVzOHKtfpMGKa +LkiGY0+8Td21ruYYvGisTRlHEIJiDjN13W6HhfXZUk5cVgDudqGqWNRQuPtyjHoE +96LdtobJoXOpWhqXQJSUDPAJy3+JaM1vcXJXmaG1wyHqYVVi36MpPyS+mN1uqRw3 +hVISZj5TG/PsPhZwtM8NmhCtgfON5YtHT5B60iudvAKrR50R4iDzZ521ylASYcPb +TlkB6Yz3d+FFM2IrCfeQ3voysw560rio3wWhMIfkBBQP4Kj5WXHr6y7QWvukfnbG +54qCXyXMkts294sk6G9lwO7VDDc/zdZj6fqcNyqK4ey/yoH2dAT54ctrel4bQceh +buCJBA0sllvb47aQ6faVEio9Dzt4Li5aEofLAN27M0wCJxY/daDZl5zP2nG5JtVb +dvxE+u9uQ9ibGPzvMbNkfCUHlksq6YlTWT26n9j/oDDEpj7AT6QQB58E5s0FHgWE +1OMAh7DnKZxYHipoQHIhmrc5Sex6f91buQ5araywxdDK8E7mZmGjXUgrtmeqoUDj +1gaftzEWon+lxjly3zOqFQwBvDQRZ8ZtXWp1ULX0CMv86SxNlc2P7MsVSr+zIFFE +LmQsDlDQ4Ov6NN0jv9aIlzKpa3IpBEOa6v3r7yCrJ40tbI5785Pjy3aI7/CZF7bI +RQsXIQARAQABiQIlBBgBAgAPBQJfBM1lAhsMBQkJZgGAAAoJEEriHhk2znhqiGAP +/iTZb5kYZfFPdXCEEQWuU8tOteTtZN4Y7iENZ4fe7QI5tJYCAaSdMXkJyW7mXD2o +lQrVkdiUIMpOOFpVKCnoQjpvfhyRtUGBDrRKPrXvZP5FSGafmu4q96HQ7O36zy4m +qibU1Zq4FXtJUjqkgFX6WOvKJOogaG8gl6n2CFw6O5jc+PMVh6GXg64pVIO5CJ+Y +6D/S0N1GSDFKnShTK/sgOF8ZOpyn8CX55QkL20IhIdipNzhjmuizcrJ3WXcWyW6B +Q5ye+F7n4wAjVt3/bGsjJ3POrjlutiv5dcHCXucYWz/+Gew/yUhl+HU5RgHzmnKS +9rpTn25vGbkvmk9Pha1X+iKwqKLE3SpslF6zNJ2VBKgX6mTGWIf653Cqp2sQXtpr +KIgr0Jy+TlmG1+b7q0reMgUT4+au2Zmq2tQmHhpjgnG9dXI6oF8KHtbRbfQ1289Z +KrhJFdWSnGVrkt5d3J2C8H+lLvCGm/rxAGyrUE0JGUdrZAIWepc5DW1TqKCwK0ue +skGOvvXqxBJ4o0U1RxcO++iU7PoUadjClG5zn8rLBkc7BwNMPtw93HUleioqWvc5 +BKwqOXWAFE2zwcDpw9mwMSJJ8xmkH0vn75KBih939DQeD0R21u8YE8BlMwSkfan9 +vRdz63ieT3Ed9ruegVq0SCQkArso3hRyjv2f/ZknpQq1uQINBF8Ez7cBEADguJIO +IbRyQ7aDMI06Di8SspkolL4sYAndIUiAf5maZO2haSJqfCI+I0XkeB8x4T4SJmAo +XsSvCeyqMt5xKqdjjhICzmbo2wmruS0GHYIiVv+Z/kpXN6jvpU67nD4MWfN6E3jc +fWh5JgNFLNUXXycfnr+rjrNsxZKTySqMhXPhxQ+pp2XqlNv1k0UkjwC/al57dFQ8 +6BRbfmQn1of3y3MLizHyaNm9VJuDaLg+8JJWedPOC+DkZfws83Y50phDYjy8Ljfe +6TecJvzxbBFc5bC7nvaLrjOp3Hz/A6aq0afpjXcEzoXb5UPzO1nRJKnByDj2DIEh +rYeoDJ/WeYIcKI7gK98L0nagW44wg8YOg0xKXtsEdhic62dvIpvYnG353v90ZbJE +Z6E5oEJ9QpC8xjwzs5U5mZIkSFnmveelytP0eUuhUj0C+a9O9uBEhN/fduFIO/HC +RC0lFU2gL/kXQ7/u/59qfQx8gLztdmQeP1uyuqoPTRJKW7nHIsTXMV76LtbNbBV6 +t9t0FqWyQarqmUrqKREZ9+6c9k5hD/DXwRJHYY4bZv5x778SwZqUYJq2V/pL+Q+o +wl32Kk4PshyZthXTvDXsFZibGzWg1KMnKIVDprRaeZ0h9VO5J2v+4maYhDtgksy1 +WTLyM5ybSanHuIRySvW2rI0F0OkUesuHQJ1HsQARAQABiQREBBgBAgAPBQJfBM+3 +AhsCBQkJZgGAAikJEEriHhk2znhqwV0gBBkBAgAGBQJfBM+3AAoJEGi4vLDFAjkF +LHsP/258zkgV49QZ9g22LW0nDR5v6YE6+VEcIO7URB99E7tjLMn5GLr+gfpj3ehG +dwNant/Xon+aAa0/p8TYfKzn/jBqT4pOJABCVGJVzvUrQcff/7236Uzdtum0GdlH +Z889vSQ15ym/bdao8awVL7m98xe7j+1441aSTpPX6PgroCnFOBViq37qwMnn+CWc +hB+rTASPTSPfTmHuBoAyk/vL3aWGGQw9/OOcjRNk93XJ6L6enCKX2zvKkIPp6SoI +OR3HA3TdLXm1zjeAK9mjb1rmIUeHrnNiIc3T1/2hSYbYBuzf98vii7Ns7j0WJO0h +GjzrFCtgGLxIi61MVc+li1VCkiFml6PLjyr1mVcl8tS9VCiKJJxM+4+651nA6p1+ +A+6JhTqSOwUWS+sEFywCB5UdhN6QzJi2hQQY6vLp6R0yqcn9KFAcxjp2XsgTslYZ +T17E5byTdI2YnKFtqX2PsR6+hAkquFEVLcnOuRnYc5wTlxgYlr5TP2Oe8fSRQN6Z +3SzCa8pPupEPxldKSCsj2RPwnlVyrbnHdEC5olzbrXDzDAurUt8l+QrDouf99jKL +PZDqtmuMv0fdZVtG0H6MD7pygT4awM3t381+441FoeSgbubDA9T/WsZCWbNR59De +slpoJkJBekDs/MNDHVMhAubrbwXGmgauLoNI/lB9zHE14O9NzdMP/ixxiRATXhHS +TjmhNXyK3dWgEvMK82So45NderIzNeyPC/+SNnKYPd9ttl3kLzU//a9xCEPcG7Mt +Zz6r/xBNpKUxx6HC4VU+HmjqGMirmYFHxxkvRPF3qcavRN9xSHKjdRq4NAjVqgmZ +9xElqK2t0Nq0JvRuq5Q2nwgD7p31H4WmKd24Fn86jF+9RrCZpkfyQWt8gcE03Obm +3x7I7ckXnf3qsrhnStseb2B4bpgK//t5hDEAW8L90RCwT6xnLJhWULOgOjrpwCeY +fltvyRucPpbwnOlgNWs/v6GjGIInWH0zKQ1OfgqBy4lo9n7iZWHVd+vSydk2Jzmf +zwAKJkin466/eo8v+UqE8itsiRTqr6C1tAyYgLpmz1knXQ73Rj9Ghg6X+XitVvCi ++Xyz1nxnm0fW7zfKFhogdPKPMUIfZXT9r6wQ/M/+dMgV7WFoEMCo6qXlppj+6j36 +W+LLXLYWG4L5q+oexvjFx+P+9+yN69iGHnkZL33fzUnS0fdImBMcR7XF9ZMiB81L +RyQRqlO4A3E6pJHDYEPz+Cy2nU0ooSOWip9vtEMSqinnaR5pj+5MxuGvlRGnKr7b +wlPVRfJeZhZKW15/lbpGtPDsHbhVh/xxzyFAiYAk1tEdcTKfMp/0wXYtD2ZqSMaM +RbEzAj63WAwCiqKdyW+LjvcPiDZloWtE +=MfmJ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/build/deps/python-windows.asc b/build/deps/python-windows.asc new file mode 100644 index 00000000..144793eb --- /dev/null +++ b/build/deps/python-windows.asc @@ -0,0 +1,53 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: https://keybase.io/stevedower +Version: Keybase Go 1.0.11 (windows) + +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 +zFjW74efcIk4ZQ3iPg2rN5Z+Z7AKOu3TGHQ= +=wMbA +-----END PGP PUBLIC KEY BLOCK----- diff --git a/build/linux/buildAppImage.sh b/build/linux/buildAppImage.sh index ca1570bb..ebb8b3f3 100755 --- a/build/linux/buildAppImage.sh +++ b/build/linux/buildAppImage.sh @@ -11,8 +11,8 @@ set -x # # Authors: Michael Altfield # Created: 2020-05-30 -# Updated: 2024-03-06 -# Version: 1.2 +# Updated: 2024-03-22 +# Version: 1.3 ################################################################################ ################################################################################ @@ -112,6 +112,42 @@ else ${SUDO} apt-get -y install ${APT_PACKAGES} fi +# get the app's dependencies +tmpDir="`mktemp -d`" || exit 1 +pushd "${tmpDir}" +git clone https://github.com/BusKill/buskill-app-deps.git + +mkdir gnupg +chmod 0700 gnupg +popd +gpg --homedir "${tmpDir}/gnupg" --import "build/deps/buskill.asc" +gpgv --homedir "${tmpDir}/gnupg" --keyring "${tmpDir}/gnupg/pubring.kbx" "${tmpDir}/buskill-app-deps/build/deps/SHA256SUMS.asc" "${tmpDir}/buskill-app-deps/build/deps/SHA256SUMS" + +# confirm that the signature is valid. `gpgv` would exit 2 if the signature +# isn't in our keyring (so we are effectively pinning it), it exits 1 if there's +# any BAD signatures, and exits 0 "if everything is fine" +if [[ $? -ne 0 ]]; then + echo "ERROR: Invalid PGP signature!" + exit 1 +fi + +pushd "${tmpDir}/buskill-app-deps/build/deps" +sha256sum --strict --check SHA256SUMS + +# confirm that the checksums of all the files match what's expected in the +# the signed SHA256SUSM file. +if [[ $? -ne 0 ]]; then + echo "ERROR: Invalid checksums!" + exit 1 +fi + +# copy all the now-verified files to our actual repo +popd +cat "${tmpDir}/buskill-app-deps/build/deps/SHA256SUMS" | while read line; do + file_path="${tmpDir}/buskill-app-deps/build/deps/$(echo $line | cut -d' ' -f2)" + cp ${file_path} build/deps/ +done + ################# # FIX CONSTANTS # ################# From faf81760e08c848908fb5a1703e37009f7a97270 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Fri, 22 Mar 2024 12:37:02 -0500 Subject: [PATCH 04/22] attempting to switch dependencies to buskill-app-deps repo for macos builds * https://github.com/BusKill/buskill-app/issues/24 --- build/mac/buildDmg.sh | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index 49be8a40..11b878b4 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -9,8 +9,8 @@ set -x # # Authors: Michael Altfield # Created: 2020-06-24 -# Updated: 2024-03-06 -# Version: 0.9 +# Updated: 2024-03-22 +# Version: 1.0 ################################################################################ ################################################################################ @@ -131,6 +131,41 @@ fi # * https://github.com/BusKill/buskill-app/issues/2 #brew update +tmpDir="`mktemp -d`" || exit 1 +pushd "${tmpDir}" +git clone https://github.com/BusKill/buskill-app-deps.git + +mkdir gnupg +chmod 0700 gnupg +popd +gpg --homedir "${tmpDir}/gnupg" --import "build/deps/buskill.asc" +gpgv --homedir "${tmpDir}/gnupg" --keyring "${tmpDir}/gnupg/pubring.kbx" "${tmpDir}/buskill-app-deps/build/deps/SHA256SUMS.asc" "${tmpDir}/buskill-app-deps/build/deps/SHA256SUMS" + +# confirm that the signature is valid. `gpgv` would exit 2 if the signature +# isn't in our keyring (so we are effectively pinning it), it exits 1 if there's +# any BAD signatures, and exits 0 "if everything is fine" +if [[ $? -ne 0 ]]; then + echo "ERROR: Invalid PGP signature!" + exit 1 +fi + +pushd "${tmpDir}/buskill-app-deps/build/deps" +sha256sum --strict --check SHA256SUMS + +# confirm that the checksums of all the files match what's expected in the +# the signed SHA256SUSM file. +if [[ $? -ne 0 ]]; then + echo "ERROR: Invalid checksums!" + exit 1 +fi + +# copy all the now-verified files to our actual repo +popd +cat "${tmpDir}/buskill-app-deps/build/deps/SHA256SUMS" | while read line; do + file_path="${tmpDir}/buskill-app-deps/build/deps/$(echo $line | cut -d' ' -f2)" + cp ${file_path} build/deps/ +done + # copy all our brew depends into the brew cache dir cacheDir=`brew --cache` ls -lah ${cacheDir} From e213eb1a58b0f90d5357351bc93e34b0cec2cc3e Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Fri, 22 Mar 2024 12:45:36 -0500 Subject: [PATCH 05/22] enable internet access for the git clone --- build/mac/buildDmg.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index 11b878b4..71b1cda7 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -133,7 +133,10 @@ fi tmpDir="`mktemp -d`" || exit 1 pushd "${tmpDir}" +# (temporarily) re-enable internet access +export all_proxy='' git clone https://github.com/BusKill/buskill-app-deps.git +export all_proxy='http://example.com:9999' mkdir gnupg chmod 0700 gnupg From a95033aecd007dd77b6b95a3ccbc01ce143bc3ab Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Fri, 22 Mar 2024 13:00:52 -0500 Subject: [PATCH 06/22] switching to the MacOS equivalent of sha256sum * https://apple.stackexchange.com/a/322148/379981 --- build/mac/buildDmg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index 71b1cda7..e19fcd38 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -153,7 +153,7 @@ if [[ $? -ne 0 ]]; then fi pushd "${tmpDir}/buskill-app-deps/build/deps" -sha256sum --strict --check SHA256SUMS +shasum --algorithm 256 --warn --check SHA256SUMS # confirm that the checksums of all the files match what's expected in the # the signed SHA256SUSM file. From e6ae424b70edf3d1626dc17b7f87f94c58811685 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Fri, 22 Mar 2024 13:21:38 -0500 Subject: [PATCH 07/22] attempt to update windows builds to use new buskill-app-deps repo This commit will not work; I need to find a powershell equivalent to sha256sums in order to verify the integrity of the files after verifying the authenticity of the signed SHA256SUMS digest file --- build/windows/buildExe.ps1 | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/build/windows/buildExe.ps1 b/build/windows/buildExe.ps1 index 7972148a..ba0224a9 100644 --- a/build/windows/buildExe.ps1 +++ b/build/windows/buildExe.ps1 @@ -92,6 +92,50 @@ Write-Output 'INFO: Beginning execution' # INSTALL DEPENDS # ################### +# securely download depends from our buskill-app-deps repo +$tmpDir = Join-Path $Env:Temp $(New-Guid) +echo "${tmpDir}" +New-Item -Path "${tmpDir}" -Type Directory | Out-String +if ( $? -ne $true ){ + echo "ERROR: Failed to create tmpDir" | Out-String + exit 1 | Out-String +} +pushd "${tmpDir}" +git clone https://github.com/BusKill/buskill-app-deps.git + +# prepare homedir and keyring for `gpgv` +mkdir gnupg | Out-String +popd | Out-String +gpg --homedir "${tmpDir}\gnupg" --import "build\deps\buskill.asc" | Out-String +ls "${tmpDir}\gnupg" | Out-String + +# confirm that the signature is valid. `gpgv` would exit 2 if the signature +# isn't in our keyring (so we are effectively pinning it), it exits 1 if there's +# any BAD signatures, and exits 0 "if everything is fine" +gpgv --homedir "${tmpDir}\gnupg" --keyring "pubring.kbx" "${tmpDir}\buskill-app-deps\build\deps\SHA256SUMS.asc" "${tmpDir}\buskill-app-deps\build\deps\SHA256SUMS" | Out-String +if ( $? -ne $true -or $LastExitCode -ne 0 ){ + echo "ERROR: Invalid PGP signature!" | Out-String + exit 1 | Out-String +} + +pushd "${tmpDir}/buskill-app-deps/build/deps" +# TODO make this actually work https://github.com/BusKill/buskill-app/issues/76 +sha256sum --strict --check SHA256SUMS + +# confirm that the checksums of all the files match what's expected in the +# the signed SHA256SUSM file. +if ( $? -ne $true -or $LastExitCode -ne 0 ){ + echo "ERROR: Invalid checksums!" | Out-String + exit 1 | Out-String +} + +# copy all the now-verified files to our actual repo +popd +cat "${tmpDir}/buskill-app-deps/build/deps/SHA256SUMS" | while read line; do + file_path="${tmpDir}/buskill-app-deps/build/deps/$(echo $line | cut -d' ' -f2)" + cp ${file_path} build/deps/ +done + # See https://docs.python.org/3.7/using/windows.html#installing-without-ui Write-Output 'INFO: Installing python' New-Item -Path C:\tmp -Type Directory | Out-String From 45fb081105672d0c43ba81beac3a278575118f50 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 11:29:40 -0500 Subject: [PATCH 08/22] testing fixing & upgrading brew installs * https://github.com/BusKill/buskill-app-deps/commit/f5191ea0843dca171642b1bbce38984143695aa9 * https://github.com/BusKill/buskill-app/issues/78 --- build/mac/buildDmg.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index e19fcd38..b5acc882 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -131,6 +131,7 @@ fi # * https://github.com/BusKill/buskill-app/issues/2 #brew update +# fetch signed dependencies from 'buskill-app-deps' repo tmpDir="`mktemp -d`" || exit 1 pushd "${tmpDir}" # (temporarily) re-enable internet access @@ -150,7 +151,7 @@ gpgv --homedir "${tmpDir}/gnupg" --keyring "${tmpDir}/gnupg/pubring.kbx" "${tmpD if [[ $? -ne 0 ]]; then echo "ERROR: Invalid PGP signature!" exit 1 -fi +ei pushd "${tmpDir}/buskill-app-deps/build/deps" shasum --algorithm 256 --warn --check SHA256SUMS @@ -174,10 +175,21 @@ cacheDir=`brew --cache` ls -lah ${cacheDir} # install os-level depends -brew reinstall build/deps/wget-1.20.3_2.catalina.bottle.tar.gz +#brew reinstall build/deps/wget-1.20.3_2.catalina.bottle.tar.gz +brew reinstall wget-1.24.5.ventura.bottle.tar.gz + +brew reinstall wget-1.24.5.rb + +brew --cache +export HOMEBREW_CACHE='build/deps/' +brew --cache +brew reinstall wget-1.24.5.rb +export HOMEBREW_CACHE='' +brew --cache brew -v uninstall --ignore-dependencies python -brew -v reinstall build/deps/python-3.7.8.catalina.bottle.tar.gz +#brew -v reinstall build/deps/python-3.7.8.catalina.bottle.tar.gz +brew -v reinstall build/deps/python-3.12.ventura.bottle.tar.gz PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | sort -n | uniq | head -n1`" # get more info immediately post-python install @@ -211,7 +223,8 @@ ${PIP_PATH} install --ignore-installed --upgrade --cache-dir build/deps/ --no-in #find /usr/local/Cellar/python/ -type f -wholename *bin/pip3* # install kivy and all other python dependencies with pip -${PIP_PATH} install --ignore-installed --upgrade --cache-dir build/deps/ --no-index --find-links file://`pwd`/build/deps/ build/deps/Kivy-1.11.1-cp37-cp37m-macosx_10_6_intel.macosx_10_9_intel.macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64.whl +#${PIP_PATH} install --ignore-installed --upgrade --cache-dir build/deps/ --no-index --find-links file://`pwd`/build/deps/ build/deps/Kivy-1.11.1-cp311-cp311-macosx_10_6_intel.macosx_10_9_intel.macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64.whl +${PIP_PATH} install --ignore-installed --upgrade --cache-dir build/deps/ --no-index --find-links file://`pwd`/build/deps/ build/deps/Kivy-2.3.0-cp312-cp312-macosx_10_9_universal2.whl ${PIP_PATH} install --ignore-installed --upgrade --cache-dir build/deps/ --no-index --find-links file://`pwd`/build/deps/ build/deps/pyinstaller-4.7.tar.gz # INSTALL LATEST PIP PACKAGES From 2184841a4d9d8f0bdf3b415466747591eac7adf1 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 11:37:20 -0500 Subject: [PATCH 09/22] fix syntax error --- build/mac/buildDmg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index b5acc882..ead08f82 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -151,7 +151,7 @@ gpgv --homedir "${tmpDir}/gnupg" --keyring "${tmpDir}/gnupg/pubring.kbx" "${tmpD if [[ $? -ne 0 ]]; then echo "ERROR: Invalid PGP signature!" exit 1 -ei +fi pushd "${tmpDir}/buskill-app-deps/build/deps" shasum --algorithm 256 --warn --check SHA256SUMS From a361631a3657f7bd66909788fb29f0c3043c595f Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 12:37:05 -0500 Subject: [PATCH 10/22] adding --verbose tag to $BREW command --- build/mac/buildDmg.sh | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index ead08f82..472b1992 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -20,6 +20,7 @@ set -x PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | sort -n | uniq | head -n1`" PIP_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/pip3* | sort -n | uniq | head -n1`" APP_NAME='buskill' +BREW='/usr/local/bin/brew --verbose" PYTHON_VERSION="`${PYTHON_PATH} --version | cut -d' ' -f2`" PYTHON_EXEC_VERSION="`echo ${PYTHON_VERSION} | cut -d. -f1-2`" @@ -176,31 +177,29 @@ ls -lah ${cacheDir} # install os-level depends #brew reinstall build/deps/wget-1.20.3_2.catalina.bottle.tar.gz -brew reinstall wget-1.24.5.ventura.bottle.tar.gz +${BREW} reinstall wget-1.24.5.ventura.bottle.tar.gz -brew reinstall wget-1.24.5.rb +${BREW} reinstall wget-1.24.5.rb -brew --cache -export HOMEBREW_CACHE='build/deps/' -brew --cache -brew reinstall wget-1.24.5.rb -export HOMEBREW_CACHE='' -brew --cache - -brew -v uninstall --ignore-dependencies python +${BREW} uninstall --ignore-dependencies python #brew -v reinstall build/deps/python-3.7.8.catalina.bottle.tar.gz -brew -v reinstall build/deps/python-3.12.ventura.bottle.tar.gz +${BREW} reinstall build/deps/python-3.12.ventura.bottle.tar.gz PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | sort -n | uniq | head -n1`" # get more info immediately post-python install #ls -lah /usr/local/Cellar/python/ #find /usr/local/Cellar/python/ -type f -wholename *bin/python3* -brew reinstall build/deps/libmodplug-0.8.9.0.catalina.bottle.1.tar.gz -brew reinstall build/deps/sdl2-2.0.12_1.catalina.bottle.tar.gz -brew reinstall build/deps/sdl2_image-2.0.5.catalina.bottle.tar.gz -brew reinstall build/deps/sdl2_mixer-2.0.4.catalina.bottle.tar.gz -brew reinstall build/deps/sdl2_ttf-2.0.15.catalina.bottle.tar.gz +#${BREW} reinstall build/deps/libmodplug-0.8.9.0.catalina.bottle.1.tar.gz +${BREW} reinstall build/deps/libmodplug-0.8.9.0.ventura.bottle.tar.gz +#${BREW} reinstall build/deps/sdl2-2.0.12_1.catalina.bottle.tar.gz +${BREW} reinstall build/deps/sdl2-2.30.1.ventura.bottle.tar.gz +#${BREW} reinstall build/deps/sdl2_image-2.0.5.catalina.bottle.tar.gz +${BREW} reinstall build/deps/sdl2_image-2.8.2_1.ventura.bottle.tar.gz +#${BREW} reinstall build/deps/sdl2_mixer-2.0.4.catalina.bottle.tar.gz +${BREW} reinstall build/deps/sdl2_mixer-2.8.0.ventura.bottle.tar.gz +#${BREW} reinstall build/deps/sdl2_ttf-2.0.15.catalina.bottle.tar.gz +${BREW} reinstall build/deps/sdl2_ttf-2.22.0.ventura.bottle.tar.gz # check contents of pip binary cat ${PIP_PATH} From 809dd4c36876c25b63e3619231f5ceee34e2a1b1 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 12:46:35 -0500 Subject: [PATCH 11/22] specifying the formula by relative path using "./" per the documentation From `man brew`: BREW(1) brew BREW(1) NAME brew - The Missing Package Manager for macOS (or Linux) SYNOPSIS brew --version brew command [--verbose|-v] [options] [formula] ... ... TERMINOLOGY formula Homebrew package definition that builds from upstream sources ... install formula Install formula. formula is usually the name of the formula to install, but it has other syntaxes which are listed in the SPECIFYING FORMULAE section. ... SPECIFYING FORMULAE Many Homebrew commands accept one or more formula arguments. These arguments can take several different forms: The name of a formula e.g. git, node, wget. The fully-qualified name of a tapped formula Sometimes a formula from a tapped repository may conflict with one in homebrew/core. You can still access these formulae by using a special syntax, e.g. homebrew/dupes/vim or homebrew/ver- sions/node4. An arbitrary file Homebrew can install formulae from a local path. It can point to either a formula file or a bottle. Prefix relative paths with ./ to prevent them from being interpreted as a formula or tap name. --- build/mac/buildDmg.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index 472b1992..6e8b897f 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -179,7 +179,9 @@ ls -lah ${cacheDir} #brew reinstall build/deps/wget-1.20.3_2.catalina.bottle.tar.gz ${BREW} reinstall wget-1.24.5.ventura.bottle.tar.gz -${BREW} reinstall wget-1.24.5.rb +${BREW} reinstall ./wget-1.24.5.rb +${BREW} reinstall wget +${BREW} reinstall wget ${BREW} uninstall --ignore-dependencies python #brew -v reinstall build/deps/python-3.7.8.catalina.bottle.tar.gz From 9b388d1117630e046cd54733829e649fe843be53 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 12:49:33 -0500 Subject: [PATCH 12/22] fix syntax in defining BREW variable --- build/mac/buildDmg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index 6e8b897f..f71dabc2 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -20,7 +20,7 @@ set -x PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | sort -n | uniq | head -n1`" PIP_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/pip3* | sort -n | uniq | head -n1`" APP_NAME='buskill' -BREW='/usr/local/bin/brew --verbose" +BREW='/usr/local/bin/brew --verbose' PYTHON_VERSION="`${PYTHON_PATH} --version | cut -d' ' -f2`" PYTHON_EXEC_VERSION="`echo ${PYTHON_VERSION} | cut -d. -f1-2`" From 2f90e54d24e23fe9e61e3ce9c8639e0e72d7af12 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 12:56:17 -0500 Subject: [PATCH 13/22] apparently the --verbose flag has to come *after* the command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2024-03-26T17:52:12.2678810Z + /usr/local/bin/brew --verbose reinstall ./wget-1.24.5.rb 2024-03-26T17:52:12.2642080Z ␛[31mError:␛[0m Unknown command: --verbose --- build/mac/buildDmg.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index f71dabc2..f3d3199b 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -20,7 +20,7 @@ set -x PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | sort -n | uniq | head -n1`" PIP_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/pip3* | sort -n | uniq | head -n1`" APP_NAME='buskill' -BREW='/usr/local/bin/brew --verbose' +BREW='/usr/local/bin/brew' PYTHON_VERSION="`${PYTHON_PATH} --version | cut -d' ' -f2`" PYTHON_EXEC_VERSION="`echo ${PYTHON_VERSION} | cut -d. -f1-2`" @@ -177,15 +177,14 @@ ls -lah ${cacheDir} # install os-level depends #brew reinstall build/deps/wget-1.20.3_2.catalina.bottle.tar.gz -${BREW} reinstall wget-1.24.5.ventura.bottle.tar.gz +${BREW} reinstall --verbose wget-1.24.5.ventura.bottle.tar.gz -${BREW} reinstall ./wget-1.24.5.rb -${BREW} reinstall wget -${BREW} reinstall wget +${BREW} reinstall --verbose ./wget-1.24.5.rb +${BREW} reinstall --verbose wget -${BREW} uninstall --ignore-dependencies python +${BREW} uninstall --verbose --ignore-dependencies python #brew -v reinstall build/deps/python-3.7.8.catalina.bottle.tar.gz -${BREW} reinstall build/deps/python-3.12.ventura.bottle.tar.gz +${BREW} reinstall --verbose build/deps/python-3.12.ventura.bottle.tar.gz PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | sort -n | uniq | head -n1`" # get more info immediately post-python install @@ -193,15 +192,15 @@ PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | #find /usr/local/Cellar/python/ -type f -wholename *bin/python3* #${BREW} reinstall build/deps/libmodplug-0.8.9.0.catalina.bottle.1.tar.gz -${BREW} reinstall build/deps/libmodplug-0.8.9.0.ventura.bottle.tar.gz +${BREW} reinstall --verbose build/deps/libmodplug-0.8.9.0.ventura.bottle.tar.gz #${BREW} reinstall build/deps/sdl2-2.0.12_1.catalina.bottle.tar.gz -${BREW} reinstall build/deps/sdl2-2.30.1.ventura.bottle.tar.gz +${BREW} reinstall --verbose build/deps/sdl2-2.30.1.ventura.bottle.tar.gz #${BREW} reinstall build/deps/sdl2_image-2.0.5.catalina.bottle.tar.gz -${BREW} reinstall build/deps/sdl2_image-2.8.2_1.ventura.bottle.tar.gz +${BREW} reinstall --verbose build/deps/sdl2_image-2.8.2_1.ventura.bottle.tar.gz #${BREW} reinstall build/deps/sdl2_mixer-2.0.4.catalina.bottle.tar.gz -${BREW} reinstall build/deps/sdl2_mixer-2.8.0.ventura.bottle.tar.gz +${BREW} reinstall --verbose build/deps/sdl2_mixer-2.8.0.ventura.bottle.tar.gz #${BREW} reinstall build/deps/sdl2_ttf-2.0.15.catalina.bottle.tar.gz -${BREW} reinstall build/deps/sdl2_ttf-2.22.0.ventura.bottle.tar.gz +${BREW} reinstall --verbose build/deps/sdl2_ttf-2.22.0.ventura.bottle.tar.gz # check contents of pip binary cat ${PIP_PATH} From 2dbd32b55ad3d66abee19977c8e3dafbae7a1d56 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 14:20:02 -0500 Subject: [PATCH 14/22] let's see if s/reinstall/install/ makes a difference --- build/mac/buildDmg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index f3d3199b..a851d695 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -180,6 +180,7 @@ ls -lah ${cacheDir} ${BREW} reinstall --verbose wget-1.24.5.ventura.bottle.tar.gz ${BREW} reinstall --verbose ./wget-1.24.5.rb +${BREW} install --verbose ./wget-1.24.5.rb ${BREW} reinstall --verbose wget ${BREW} uninstall --verbose --ignore-dependencies python From 4b50c3450c4002a5e0003c6308b3781ca56ea4a8 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 15:31:51 -0500 Subject: [PATCH 15/22] pinning build platform of macos to macos-13 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 838620fd..e5a3a03e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,7 +112,7 @@ jobs: shell: bash mac: - runs-on: macos-latest + runs-on: macos-13 steps: From 1694322b2334d97b1c73a48095e270a55a3792f6 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 15:49:46 -0500 Subject: [PATCH 16/22] adding HOMEBREW_NO_INSTALL_FROM_API --- build/mac/buildDmg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index a851d695..41918b7b 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -39,6 +39,7 @@ export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) # authentication and integrity checks and could be a vector for MITM attacks # poisoning our builds export HOMEBREW_NO_AUTO_UPDATE=1 +export HOMEBREW_NO_INSTALL_FROM_API=1 export all_proxy='http://example.com:9999' export HOMEBREW_CACHE="`pwd`/build/deps/" From b6ba32b874a80f6ab19c8a5bc880a6b3d2187707 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 15:50:21 -0500 Subject: [PATCH 17/22] added HOMEBREW_NO_INSTALL_UPGRADE --- build/mac/buildDmg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index 41918b7b..c30d7919 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -40,6 +40,7 @@ export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct) # poisoning our builds export HOMEBREW_NO_AUTO_UPDATE=1 export HOMEBREW_NO_INSTALL_FROM_API=1 +export HOMEBREW_NO_INSTALL_UPGRADE=1 export all_proxy='http://example.com:9999' export HOMEBREW_CACHE="`pwd`/build/deps/" From 9da60eb11c5f6641017aa0e0bfb1ba4c49e457c7 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 15:51:26 -0500 Subject: [PATCH 18/22] added --debug flag to BREW commands --- build/mac/buildDmg.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index c30d7919..616a14c8 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -179,15 +179,15 @@ ls -lah ${cacheDir} # install os-level depends #brew reinstall build/deps/wget-1.20.3_2.catalina.bottle.tar.gz -${BREW} reinstall --verbose wget-1.24.5.ventura.bottle.tar.gz +${BREW} reinstall --debug --verbose wget-1.24.5.ventura.bottle.tar.gz -${BREW} reinstall --verbose ./wget-1.24.5.rb -${BREW} install --verbose ./wget-1.24.5.rb -${BREW} reinstall --verbose wget +${BREW} reinstall --debug --verbose ./wget-1.24.5.rb +${BREW} install --debug --verbose ./wget-1.24.5.rb +${BREW} reinstall --debug --verbose wget -${BREW} uninstall --verbose --ignore-dependencies python +${BREW} uninstall --debug --verbose --ignore-dependencies python #brew -v reinstall build/deps/python-3.7.8.catalina.bottle.tar.gz -${BREW} reinstall --verbose build/deps/python-3.12.ventura.bottle.tar.gz +${BREW} reinstall --debug --verbose build/deps/python-3.12.ventura.bottle.tar.gz PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | sort -n | uniq | head -n1`" # get more info immediately post-python install @@ -195,15 +195,15 @@ PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | #find /usr/local/Cellar/python/ -type f -wholename *bin/python3* #${BREW} reinstall build/deps/libmodplug-0.8.9.0.catalina.bottle.1.tar.gz -${BREW} reinstall --verbose build/deps/libmodplug-0.8.9.0.ventura.bottle.tar.gz +${BREW} reinstall --debug --verbose build/deps/libmodplug-0.8.9.0.ventura.bottle.tar.gz #${BREW} reinstall build/deps/sdl2-2.0.12_1.catalina.bottle.tar.gz -${BREW} reinstall --verbose build/deps/sdl2-2.30.1.ventura.bottle.tar.gz +${BREW} reinstall --debug --verbose build/deps/sdl2-2.30.1.ventura.bottle.tar.gz #${BREW} reinstall build/deps/sdl2_image-2.0.5.catalina.bottle.tar.gz -${BREW} reinstall --verbose build/deps/sdl2_image-2.8.2_1.ventura.bottle.tar.gz +${BREW} reinstall --debug --verbose build/deps/sdl2_image-2.8.2_1.ventura.bottle.tar.gz #${BREW} reinstall build/deps/sdl2_mixer-2.0.4.catalina.bottle.tar.gz -${BREW} reinstall --verbose build/deps/sdl2_mixer-2.8.0.ventura.bottle.tar.gz +${BREW} reinstall --debug --verbose build/deps/sdl2_mixer-2.8.0.ventura.bottle.tar.gz #${BREW} reinstall build/deps/sdl2_ttf-2.0.15.catalina.bottle.tar.gz -${BREW} reinstall --verbose build/deps/sdl2_ttf-2.22.0.ventura.bottle.tar.gz +${BREW} reinstall --debug --verbose build/deps/sdl2_ttf-2.22.0.ventura.bottle.tar.gz # check contents of pip binary cat ${PIP_PATH} From 7dde7f621c40fbadeb121b4c3ae06f16fe2bf896 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 16:03:20 -0500 Subject: [PATCH 19/22] fix relative path to wget formula file --- build/mac/buildDmg.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index 616a14c8..59ae7622 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -183,6 +183,8 @@ ${BREW} reinstall --debug --verbose wget-1.24.5.ventura.bottle.tar.gz ${BREW} reinstall --debug --verbose ./wget-1.24.5.rb ${BREW} install --debug --verbose ./wget-1.24.5.rb +${BREW} reinstall --debug --verbose build/deps/wget-1.24.5.rb +${BREW} install --debug --verbose build/deps/wget-1.24.5.rb ${BREW} reinstall --debug --verbose wget ${BREW} uninstall --debug --verbose --ignore-dependencies python From 08236958904c5596872f8869a5fd51278c1f2e0c Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 16:16:56 -0500 Subject: [PATCH 20/22] adding brew reinstall to the bottle directly --- build/mac/buildDmg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index 59ae7622..6e65fad9 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -180,6 +180,7 @@ ls -lah ${cacheDir} # install os-level depends #brew reinstall build/deps/wget-1.20.3_2.catalina.bottle.tar.gz ${BREW} reinstall --debug --verbose wget-1.24.5.ventura.bottle.tar.gz +${BREW} reinstall --debug --verbose build/deps/wget-1.24.5.ventura.bottle.tar.gz ${BREW} reinstall --debug --verbose ./wget-1.24.5.rb ${BREW} install --debug --verbose ./wget-1.24.5.rb From 8f68614d1867943047618488e1bfc894b9bfdb00 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 16:42:55 -0500 Subject: [PATCH 21/22] added .curlrc to speedup macos builds (due to blocked internet; just fail faster with 1 second timeout and 0 retries) --- build/deps/.curlrc | 3 +++ build/mac/buildDmg.sh | 1 + 2 files changed, 4 insertions(+) create mode 100644 build/deps/.curlrc diff --git a/build/deps/.curlrc b/build/deps/.curlrc new file mode 100644 index 00000000..2f82c892 --- /dev/null +++ b/build/deps/.curlrc @@ -0,0 +1,3 @@ +connect-timeout = 1 +max-time = 1 +retry = 0 diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index 6e65fad9..abd3cfab 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -43,6 +43,7 @@ export HOMEBREW_NO_INSTALL_FROM_API=1 export HOMEBREW_NO_INSTALL_UPGRADE=1 export all_proxy='http://example.com:9999' export HOMEBREW_CACHE="`pwd`/build/deps/" +export HOMEBREW_CURLRC="`pwd`/build/deps/.curlrc" ################################################################################ # FUNCTIONS # From 5bfafbd94c4b8ce3825eac63b0a6fc9d38064f62 Mon Sep 17 00:00:00 2001 From: Michael Altfield Date: Tue, 26 Mar 2024 17:18:34 -0500 Subject: [PATCH 22/22] attempt to use virtualenvironment to install pip depends * https://github.com/BusKill/buskill-app/issues/78#issuecomment-2021558890 --- build/mac/buildDmg.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build/mac/buildDmg.sh b/build/mac/buildDmg.sh index abd3cfab..1c003039 100755 --- a/build/mac/buildDmg.sh +++ b/build/mac/buildDmg.sh @@ -19,6 +19,7 @@ set -x PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | sort -n | uniq | head -n1`" PIP_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/pip3* | sort -n | uniq | head -n1`" +VENV_PATH="/tmp/venv" APP_NAME='buskill' BREW='/usr/local/bin/brew' @@ -43,6 +44,7 @@ export HOMEBREW_NO_INSTALL_FROM_API=1 export HOMEBREW_NO_INSTALL_UPGRADE=1 export all_proxy='http://example.com:9999' export HOMEBREW_CACHE="`pwd`/build/deps/" +export HOMEBREW_CURL_RETRIES=0 export HOMEBREW_CURLRC="`pwd`/build/deps/.curlrc" ################################################################################ @@ -181,19 +183,18 @@ ls -lah ${cacheDir} # install os-level depends #brew reinstall build/deps/wget-1.20.3_2.catalina.bottle.tar.gz ${BREW} reinstall --debug --verbose wget-1.24.5.ventura.bottle.tar.gz -${BREW} reinstall --debug --verbose build/deps/wget-1.24.5.ventura.bottle.tar.gz - -${BREW} reinstall --debug --verbose ./wget-1.24.5.rb -${BREW} install --debug --verbose ./wget-1.24.5.rb -${BREW} reinstall --debug --verbose build/deps/wget-1.24.5.rb -${BREW} install --debug --verbose build/deps/wget-1.24.5.rb -${BREW} reinstall --debug --verbose wget ${BREW} uninstall --debug --verbose --ignore-dependencies python #brew -v reinstall build/deps/python-3.7.8.catalina.bottle.tar.gz ${BREW} reinstall --debug --verbose build/deps/python-3.12.ventura.bottle.tar.gz PYTHON_PATH="`find /usr/local/Cellar/python* -type f -wholename *bin/python3* | sort -n | uniq | head -n1`" +# create python virtual environment +# * https://github.com/BusKill/buskill-app/issues/78#issuecomment-2021558890 +mkdir "${VENV_PATH}" +${PYTHON_PATH} -m virtualenv "${VENV_PATH}" +PYTHON_PATH="${VENV_PATH}/bin/python" + # get more info immediately post-python install #ls -lah /usr/local/Cellar/python/ #find /usr/local/Cellar/python/ -type f -wholename *bin/python3*