From 5c060699d918a8b592e14ff2019205d40d753bc1 Mon Sep 17 00:00:00 2001 From: Jordan Bonser Date: Wed, 15 Jan 2025 12:26:22 +0000 Subject: [PATCH 1/4] feat: upgrade binaries to `cosmo.zip@4.0.2` fix the gitlab package registry url. add missing binaries to the list of binaries in the upload binary targets. --- CONTRIBUTING.md | 50 +++++- MODULE.bazel | 378 ++++++++++++++++++++++++--------------------- binaries.bzl | 5 + upload/BUILD.bazel | 6 +- 4 files changed, 260 insertions(+), 179 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fff7ba39..82ffa19f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,8 +20,22 @@ $ (cd e2e; bazelisk test //...) # Upgrading Binaries -The following script can be ran in a POSIX shell: +First off take a look at the cosmos repo for the new release and determine whether any +of the binaries which are in the sections with this text: +`# TODO: remove these when future versions make them available` +appear in the new release. If so remove them from their previous download section and either +uncomment or add them to the download binaries for the new release. +## Generating new SHAs + +Next up you will need to replace the urls in the download_file invocations to point to the new release. + +It should just be a find and replace of the version number for those urls. + +You may also need to comment out the first url for these new downloads, so that they go to cosmos +rather than our internal gitlab package registry. + +Then run following script in a POSIX shell: ```console # Clear out all integrities sed -i 's|"\([a-z0-9-]\+\)": "sha256.\+",|"\1": "",|g' MODULE.bazel @@ -31,12 +45,46 @@ for BINARY in $(rg --no-line-number '^ +"([a-z0-9-]+)": "",' -or '$1' MODULE.baz echo "${BINARY}: ${INTEGRITY}" sed -i "s|\"${BINARY}\": \"\",|\"${BINARY}\": \"${INTEGRITY}\",|" MODULE.bazel done +``` + +You should now have all the sha's generated for the new release, if there are any sha's that don't +appear then it's possible they are not in the current release. So you will need to add that to a +new `# downloads` section. Then comment out that binary from the new binaries +download target. + +If at any point you want to re-generate these sha's you will need to run `bazel clean --expunge` +to clear out the cached downloads. + +## Uploading a new Package to Gitlab + +Finally once you're happy with the sha's that have been generated you want to upload these to the +internal gitlab package registry. + +First of all you will want to modify the url's in +`upload/BUILD.bazel` to point to the new release version, and run this in a POSIX shell: + +```console # Upload all binaries for TARGET in $(bazelisk query 'upload:*' | tail -n +2); do bazelisk run "${TARGET}" done ``` +Now you can check the package registry to ensure a new package entry is there for the new version. + +If at this point there are no new versions, you may want to ensure that your `~/.netrc` file is +setup for access to gitlab using a personal access token, and try again. + +Finally ensure all the gitlab package registry urls in `MODULE.bazel` are uncommented so that they +can be used as a mirror going forward. + +## Confirming Correct SHA's +One final check you can do is to comment out all the external urls in `MODULE.bazel` for the new +cosmo version to ensure it only retrieves the packages from the Gitlab Package Registry. + +Then run `bazel clean --expunge` before re-running the commands from [Generating new SHA's](#generating-new-shas) then you should have no change to the `MODULE.bazel` file, other than your commented out urls. + + # Release `semantic-release` performs automatic releases of the project. diff --git a/MODULE.bazel b/MODULE.bazel index 56d0244b..fa77bb78 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -47,9 +47,9 @@ download_file( integrity = "sha256-eK954gq7s/malzVZWbWb1YlJVkBkrbdU8DAuurtL96M=", output = "ape-m1.c", urls = [ - "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.9.2/ape-m1.c", - "https://cosmo.zip/pub/cosmos/v/3.9.2/bin/ape-m1.c", - "https://raw.githubusercontent.com/jart/cosmopolitan/3.9.2/ape/ape-m1.c", + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2/ape-m1.c", + "https://cosmo.zip/pub/cosmos/v/4.0.2/bin/ape-m1.c", + "https://raw.githubusercontent.com/jart/cosmopolitan/4.0.2/ape/ape-m1.c", ], ) @@ -69,8 +69,8 @@ compile( integrity = integrity, output = "ape", urls = [ - "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmo.zip/3.9.2/{}".format(binary), - "https://cosmo.zip/pub/cosmos/v/3.9.2/bin/{}".format(binary), + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2/{}".format(binary), + "https://cosmo.zip/pub/cosmos/v/4.0.2/bin/{}".format(binary), ], ) for binary, integrity in { @@ -116,8 +116,8 @@ export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain integrity = integrity, output = binary, urls = [ - "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmo.zip/3.9.2/{}".format(binary), - "https://cosmo.zip/pub/cosmos/v/3.9.2/bin/{}".format(binary), + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2/{}".format(binary), + "https://cosmo.zip/pub/cosmos/v/4.0.2/bin/{}".format(binary), ], ), ape_entrypoint( @@ -130,161 +130,161 @@ export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain ), ) for binary, integrity in { - "assimilate": "sha256-PS58KWG6g7AOVIb7s06M/Ty/isPKqJRsXPD01YCuwEI=", - "awk": "sha256-IZ5IJjPT94e2JckRenCHJxEDJG0HTCdcCmZZ93bB4uA=", - "b2sum": "sha256-F0zWk9FWibzBHoeIvAOmt4UuCrjlAWOtdOc2Buwj8ds=", - "base32": "sha256-wGNy5OwXISFDkPWCT5OgKw4cWZ1pHDpBFwGid/DHXOo=", - "base64": "sha256-s56msYduxFwHex+byRFq7WNc3u01vLrzrTHJHIt5lHE=", - "basename": "sha256-U+T2z7ld01xNDgAA5PpOl6RPQ5dHXVRP0AvaldOkziw=", - "basenc": "sha256-tPhG9s7UcfnQHLRtiD3QUX6tMN6qoeIpm2NKHV/LA7I=", - "bash": "sha256-oaYXXHpNQTup5rKySp8OE7k1eeOLHxZko9liwuNPeds=", - "berry": "sha256-6bYdr1wVk2g7OXslx4mTw9cXjtolweDlxnVG0SDJ6t8=", - "brotli": "sha256-tVmNf4RYEGWjSXjxr59llh+qSigcV/Fofixge3bvSFc=", - "bzip2": "sha256-ICsJOD3kJ6ba0PaBvPvjtBWp6PPGkCtM1G/mJJX2amU=", - "cat": "sha256-5vPf34E3IWaq9EDKYtTB9iZXOFBYM6Actp2OFjrnCm4=", - "chcon": "sha256-HO7mByjlPF6da8f+14usAGqLfQFp/O5O12T1Ujimi+k=", - "chgrp": "sha256-UyDs2L1YY8eBbpO9IeDnmIeDiCwbQAjHur+g7pMkt08=", - "chown": "sha256-xp9d3TQzeOh0rxh0NuVXk/vXepkXyvJTanlqyiwifOM=", - "chroot": "sha256-+QFCuQXZHTS8sf8nuBdTMmf+71lTRyRnSD0O+yMAR/8=", - "cksum": "sha256-1w9i1SWKRsjECCSOvRahrjdK9vLMqTS/prvINbv+TwY=", + "assimilate": "sha256-k/Y6rBQEa8JTDk+Y/03HreLjo6oxNs7T21mL9rACbtw=", + "awk": "sha256-EBdsbIdW8ZDnn4ZQDaDoh8MBOkepzW9Jr3/igEJASzw=", + "b2sum": "sha256-zOSu2+eBpJyyBbHoy8SYDLQW1q8dlLaL7i8yHz0HSiw=", + "base32": "sha256-O7HWkfnjMq0CofXMyVIo/ijtKbbo78Kxt58yAgahGLQ=", + "base64": "sha256-tsdBbeK0OLHowgCCl882IoHK5EoEgyFBxKxNNd2JxZI=", + "basename": "sha256-uf/93T81zL3k0vD8FGj01SGve/wPs4zQeco+/1aG4WA=", + "basenc": "sha256-xaimREW9eXAo3R0IXO9+3DmvcmNsLXiXP5QbEkfVV3Q=", + "bash": "sha256-XefKshjBJYNBPFQTY4SLwnjo9I26B9lrn1eQ70C3Lj4=", + "berry": "sha256-XbC38C25o/85yKvTrL7xLwLcWIydZS+7t1PhYTE67B0=", + "brotli": "sha256-znbwnS6wCapaj2jXucmpHWvDkDv26y1dIgwZaIkIg1Y=", + "bzip2": "sha256-WU2kkvQ9uds++DjKELEb3CuWkL96Hft66v7/dd6H3Sc=", + "cat": "sha256-2RxtD90EmVOoZvOm+a43HKPaUAOxiCw9n7lfYGu/cdM=", + "chcon": "sha256-Hq4bdXptNpBdUlB+k1cXGXAhPnKyEQ4Py1ZLH8+5gu8=", + "chgrp": "sha256-tEzHHeZCvvN7D1SmM7OOs7ZYBebFsZnTssKxLvTkDp8=", + "chown": "sha256-Vup9h5JqJjNnlZBHYelvKgGukqiZnl+C6vz7tZVmbcs=", + "chroot": "sha256-gso87OSRJo/IKgGEeDuMF/9IVkP132N9LWg8m/ZPveA=", + "cksum": "sha256-euZaxDUnQwNyJnyLgwGhA+2QnwBaM/EG1qGvl/2uoZU=", "clang-format": "sha256-t1/HDaTZ/klR+VFONNcqj5uxgIm37dafKu5Mp99ecVQ=", - "cmp": "sha256-tzASXhF5YQx9Y36T+wNOEhzra0bmM6fZXY0HMrRogVE=", - "comm": "sha256-2oTUznG8fFsxthijCr8UROKBh3/tavTZ/YdCn+JLldY=", - "cpuid": "sha256-CZ4BBnt9/4FYlqCg7LISVPcGcxccAs7FPWIFzPd/lM8=", - "csplit": "sha256-7FO56WA8ajpPctbgLtY6NAA6TTeHzrYdmfbRxWJoKzk=", - "ctags": "sha256-F1WPQ4DjU9OXU8Fpw2ylnRCNxuQKfP2OlkCMBLQ1pbs=", - "curl": "sha256-g8NaOJIcFyscRCpQft5p2YnN9/mDsH68ZfM/pXUvCgA=", - "cut": "sha256-WP7LjKXjqTOWBN9t/xokk7Wtir5+A64O9tD6bB+SuT4=", - "dash": "sha256-EGaaICVq9bPakMFvKDAOY5Z4X/BmZUNxwOFAFYSLR0Y=", - "datasette": "sha256-jluDzFTRMPfuxfMV23f8mlPNoDalXhrtPXK7FA3ZvK0=", - "date": "sha256-3mMc3qBeWkh0VULDzLrrlBWL8BJ10RTjugwz0mrHMq4=", - "df": "sha256-AZ1qO9RN23LK70Z7uZuwIiwSsWw5ZNWFmPhB07nL43k=", - "dir": "sha256-Lf8zsbbKvS8Wyz3/3tZ0mcJA4ILM84YE2liQJCEBrDU=", - "dircolors": "sha256-BXWeDYCy6K2zG2h3ZyaOVaBjRa73Ds/DNT4q6LSNUpU=", - "dirname": "sha256-raGvhJoVB12v8fRj5IF72yFIL8OeHRrkkh4DcRRmGmQ=", - "diff": "sha256-vOGWyeL8Y8aCCsp5XndKLPcIgPxupHdMn5Ev+KZmZ20=", - "diff3": "sha256-MSt7+ofQRs8pLmOlanJUi4KKMBAPXsfqGNepGUnDB1Y=", - "du": "sha256-Ly9HwaHYVrQkBDkEilaHpW60DqjGjjajUvwtTmsRZLU=", - "emacs": "sha256-2LD4hBr2+S6wMQR4tqP14fVKJwLPR5LqwppI9N2bZ7M=", - "emacsclient": "sha256-K6nNydfsRJOBOn7CYcwoIVr/egLk0DgEbdxpWraGB4w=", - "env": "sha256-cTNg+pak5y/DJsheVPcnRoNFnN+EHYfOjzCmRu0g4/E=", - "expand": "sha256-zu2lneJHOHTc7KSwSxxkWPf1J7XKsPgi14jkA74X2Jo=", - "expr": "sha256-9g+02igI4hAg6O6I8Cux3C5cJQBRyngZW45/z4ZigKA=", - "factor": "sha256-jltnOvjKJwjdstuyXYa8QJT8Ml2ldRrnEWDpkOGb6DU=", - "false": "sha256-BYJ242yBAoRVb0m7PihdcofIhxx22ZX8oj+Fx3tMkEA=", - "find": "sha256-M+W2ibC/37EbzSjd2z+1jsJd4LDRI4lDrCBn9VnGz4U=", - "fmt": "sha256-wvCr+J53XVYOncrXZX/Nk8KFcDczUquc/PxOktGBQzU=", - "fold": "sha256-PZ586pmywxqKk74cutpZ+bwYl5YN/rhzwwFoXDPf2sI=", - "gmake": "sha256-bdEFOe8MBcbaJrn1/6OK+M1NGV3CI2TkWD8FjTOE8tM=", - "greenbean": "sha256-AkCPQclECaeym/TzhUkXBqDYI1KeT3ho4cuzqiAwoKw=", - "grep": "sha256-T/5O9AiDqWulHpdtG0TuWvDAvf3Gg3mPQlPnzOli89g=", - "groups": "sha256-FyUGCy+KYR/tyNg6nfPhAWJFySiwdhK8WBQjLEC5lqE=", - "head": "sha256-l7V/E7s0mLFYyAxpQXsceAOXtHbOpRzONMyAh5oxzH4=", - "id": "sha256-TtoZ7zTIrw1Bp7trxRZmhsbC2wVvGeUGKkRatu642tE=", - "install": "sha256-johtqj5v0NlhUEiwLq/P8RWuiglrPjKmdT2/dz2TLWQ=", - "join": "sha256-NcMp4cEtQVpIabONmY+q8ClcMRLveI0Gl0NFEiqJotk=", - "kill": "sha256-T0TuZpzuU36lPI6FThbEwYJxRbEuH18YEVlG8SfOhKI=", - "less": "sha256-/d2wuWZvEZfG1QXg3HKShsIH2e/YBWPRV8FeTKcUYi4=", - "life": "sha256-igi3K3hCEQ8UoAlOnc0aYjgZlXeyK52QgeK+MUfyng0=", - "link": "sha256-RVGpuynDmCS8cCvaK3h4cinGIHSSuT8o4k9fIOJporE=", - "links": "sha256-PTVlG3R3b4BGk4qZT4ejlXz35hpfTbnQdcZcK5F5bYw=", - "ln": "sha256-k5pICFSa7na2XHmoTLwpqoY6fbpDS0Aora9UDgE+rAc=", - "locate": "sha256-uxzJS2cGdaGPsxaizj8uDAwFTlWNaNFAIJpehk1Rrfw=", - "logname": "sha256-OH14D3piwdO5YDQgqQ44qDZh9SOl6TT8WwSiA1cXmaI=", - "ls": "sha256-YMvIoO0R1VN+FhW+W8ArcuNe7HPNx0dSNa6AwrEr/kc=", - "lua": "sha256-etfFv/TbjI3Oozs53C8fxiszBQrTTQUgR+pq6V/FgSQ=", + "cmp": "sha256-qlA2ZYyfhYNA96JDsPUhF4SsDcSQ/LHcCYH0aeDpVhc=", + "comm": "sha256-HSps5lFxnVJuqSifPZzQ/0V551QD40AblS/lJ09BGXE=", + "cpuid": "sha256-NnD7jArSDPP39Vq2XP/bnZmt8X9HUhZ10vypFjVf+gk=", + "csplit": "sha256-WmtIlruvvTd7o0Mk6vtwrhDzNejZWI2RDebvZsLSDsA=", + "ctags": "sha256-MQU0syhSWYuxSvyAGIiJXlVqmF/c61pyIXSRdSlg0fA=", + "curl": "sha256-96LGweDzKygcS3+j5Op5dIpM8tQWyDyrc1LoJcVSIKE=", + "cut": "sha256-AIVT3p4msNujMHF5HcLirWdIQJ6rs4dzWFj7VspcyL8=", + "dash": "sha256-0Lg2YPAFrzZAXjskZQ0FxVQT4GoEP3xcQy4AEiDlgkk=", + "datasette": "sha256-M9OABKCiWQgaYMrT+uF1e11Bg2Yp/ed6HwqkGtxuiEE=", + "date": "sha256-rL+gCG07DxVoV0pefXPxp1X/mPxjf9a1RhyN+1IX+h4=", + "df": "sha256-e/Bk09M5epuCseZ6/71D3gAvCUqMbi77jCQntoSbh88=", + "dir": "sha256-v0L31Yj4t/u0CZDUbxzain2IB509AcvCyQ2vcrGAxeU=", + "dircolors": "sha256-tqTc1QGGA+enf9UzRkxJmrxfIDPwLjXwXTCiBI4BJKo=", + "dirname": "sha256-XRLeO/naUhQlwSVhIZPynxDG4F6XHocSu6MLEIzNFVE=", + "diff": "sha256-SL55aaIT+CAXujoPCCmPTjEOYZ4VBmwk3uDrHQ5i4Fs=", + "diff3": "sha256-9fDTCPVeUFouT1m6F7rYX67OCb1oX6d1rdRm8vwGrjY=", + "du": "sha256-g3vNEZ7LXjU6Za/VcO9obRvvfU8wAa7wmzFNIUhII9o=", + "emacs": "sha256-vfWlSWlVH71Uk4wp/LhH78D/Ul+hllBWsXwAEj27JWc=", + "emacsclient": "sha256-E8thKCpjkxg9KxCJu7ZhtRrvbI7BVeGCpUhBzE5+zrw=", + "env": "sha256-ICTT5Y5GICBF3wAR0ewnR1b7BlvQJjwWoK8RLPkyN9Q=", + "expand": "sha256-BBQ0AXvKYq1fXJ+NSMfvdhJV4fnTAMLOufHPaKYW4yE=", + "expr": "sha256-Kiu9FL+6nV/QcfyzTP6VyXEQbosvScj65T64QkjQ6jo=", + "factor": "sha256-cdlzsJZFMIMb6dl2Bo6jUmQiRtAMyO+hEhzv3RFnzTc=", + "false": "sha256-a8jusSOGWeFK0XlKZDlWT4hgauAUik3c0oxu9/E8HpQ=", + "find": "sha256-5PgUE5GQrorXfpLV7qhnLMNUUuU+SEintIobIblF14M=", + "fmt": "sha256-KSg3OlcDWyHquQK448LUPDtKnZ+fdDQK2UK6Bbjqgxw=", + "fold": "sha256-yZH9+6gwYvVUQwUG7YWxbFAZ8+4m9cuFPRmeL+RNjgY=", + "gmake": "sha256-J+vMoec2zCqn6iktXln0OjorZAhaadbEZlYoBXVD9Fk=", + "greenbean": "sha256-9srJ8fYlj0FR8DvHfBPp5FeNnW/Gkf1ehgo+GYEwXNM=", + "grep": "sha256-jR+XlPUktja5ZLsg1IBwEYk3vZAFwP4fza1LFMvlqCQ=", + "groups": "sha256-Fm8Ls3cUPpS2bRD6VvFP9ImNq+R29Nlx2zs+yk3iTpk=", + "head": "sha256-9JMB6PlH24s8IVtj/74+HnzHAeQri48rCQw3dCcGI+8=", + "id": "sha256-YALT7gD51vl9jYjvfNBJMBeA0ArlATuE8pyMIJPI3SE=", + "install": "sha256-u1GLRB7OMvxfXRvDXOfAqK2xL8iVFPgie5CZRWnok/E=", + "join": "sha256-xGEX1Irgmmz/hlHwIVOwpcTv5wJO07GeHa5HbAsOpfI=", + "kill": "sha256-HUKz8Lz1HJJO1u3jchUbFWQ5WVOm5sPHoRtJH/sS1Bo=", + "less": "sha256-vCqe9jFWSM7byoeWhzEr2+dFfGXKqr3a3BTqCXIZX5o=", + "life": "sha256-tWmEMbmzsMIfUuCTBnlzyHIasVZcv0tT/O/jtZJCDoI=", + "link": "sha256-OpZ5dSDcTRtuJ4CPoVzbgcomEKi9ll7QUZZaIgmqc7s=", + "links": "sha256-x8CMITKEemShHDn5pmFVlqjmTLu0cHt9o3KQ69C75fc=", + "ln": "sha256-LoA+K72zV7mMn/bp+rfoFSaPvypAjMJ6zPkCNS5HWp0=", + "locate": "sha256-wYzNjs8Nnma/ylaCxZbwx5mLyRq5+MLyPu/9+vSijnY=", + "logname": "sha256-ugpDLbQTaaopdbcfodhaiq6BAndNx1Y5jVzNLVGRSIc=", + "ls": "sha256-ka7YfvN2PiP8YlrrkQQoSbtgjfIPC5KQ3CYuBrF2KkI=", + "lua": "sha256-hIhumroRY9zqxGDbwF3OmY7QgwKzOZEuE8SSz8H+Uqs=", "lz4": "sha256-PFx+fDvlUnhL54BQgtEuIeRIadNjR2hWukUkpyFt6bU=", - "make": "sha256-ceM7DY5ETjsCaorCSmDIMlyn7tlLsTDyWtUH64ZOOCw=", - "md5sum": "sha256-pEaNicTB6QtP9/3OZEEtQSZSLdm2rUdoxpThZHEhDAE=", - "mkfifo": "sha256-6J45XCTN9sJr/NbGmmlCElNNEq0ApTt+8IHHxyRKblw=", - "mknod": "sha256-EAwbqLrQweymrKR+Hq4Okt3otAZsNdTYVV0/eNwB1sA=", - "mktemp": "sha256-jyxQJiYJ95a6LHedlhANn4twcrpObEwQKRDcZm0qVvE=", - "mktemper": "sha256-oVNUv6ld13OyF/sNe1b1dkiH+3YO/5xAiaXtnaV2XJg=", - "nano": "sha256-BPI8H5lfW1wceiI1sg1AcqvDAtRZ+5HGSDnorwKf9jY=", - "nesemu1": "sha256-eBBakkehweXBKlvr/XT+pVCeUrnPRSyrQe4POR+4oxI=", - "nice": "sha256-V++cUbdJavAtA3iEbwQPPvSU2fF4vNzYqQBiAUZ1MDg=", - "ninja": "sha256-GZKU3ggB/iU0HRkHLKkrM0apaXUmZ3WZRBYBOxYIX4c=", - "nl": "sha256-0eKWm0/anM7OzZiVk6Y3wf4DYDIBoFpd0fTJzjK8w3U=", - "nohup": "sha256-L53Mx3FWT/cfUmfH0uD7A9eX9POsmw/zBSpBAXHzjJQ=", - "nproc": "sha256-mB1teH65rbw7uQt5AfvzzbZthDBGYyZ1esPCuvPAbZg=", - "numfmt": "sha256-PALW0r8LGz+XVRGstT0MOrtY3TkDPsqk2JQ4crgmTQw=", - "od": "sha256-agnQLk+mZzuLQL42nnuyr9lvvFt6gjr5MgTLTHnce44=", - "paste": "sha256-v9ZwD4uLxINBGFkypJJRIth5kFM/GQBLRcLQoL35dgs=", - "patch": "sha256-YMYtfKrBFNhxquTrQLyiQXss1u3+G5QsUVxRfhhrp60=", - "pathchk": "sha256-yBUBhVd7NEsHKwlwv4UvKI5MsmqM4Vtyp62FkroLHHw=", - # "pigz": "", - "pinky": "sha256-xOxFwxH3mkA7DjRtg7+1wi/kHFd64vyQlLsHt0BNtGo=", - "pledge": "sha256-xV/blwb0evvAVO+4wYpW/awsyHBxE7lz0TC5vhsRBzw=", - "pr": "sha256-uGqbUBAp9vIMIeppdtiY4XrJe49j1908gm3Xtb3VQkA=", - "printenv": "sha256-8TSW5oXCYO1qsxeiriuUMQErEhTXVR1U+AIqurwtmMs=", - "printimage": "sha256-TEYvJWzpu8zs3akbsV3EPRwcPoghcvLUYIEkadvQcz0=", - "ptx": "sha256-GwlEwQ1evfneyrIBBWQGmkNsNrg9F4wcOtdbvlQShqc=", - "pwd": "sha256-TuSi1f7O+EunjdwijjGAh1urdVA9KgB5lFvkHe3t1Lo=", - "pypack1": "sha256-zb4ooaMXbQ5BtFMf+kRyRJ/15z7rCQ8i9GQfcei9mOM=", - "python": "sha256-zBm8Y106cQKThiAp2qbyb7FRuGkMz0vE/kCaz0imDeg=", - # "qjs": "", - "readlink": "sha256-kPK24ZLmsp6G0gTJFxN3Mnk2DlxJtSg6080abdTKP8M=", - "realpath": "sha256-P+viEMKUyIqIFHf9h3RrW+trqtMNrCNDPWU6YDEkozI=", - "redbean": "sha256-9p0nd+cNLbU56gK68NjHuGTntBrG6/YR/DbrMq4+WV8=", - "rmdir": "sha256-vZyv84GhPv1Kb6WmLdAxJo7TjW7ubPg22xOzMI3oWmM=", - # "rsync": "", - "runcon": "sha256-KopbC3k4qWa3gp113AaXev/ADkCD0oh/qmEwiGQEaa8=", - "script": "sha256-mmKRBBvCDw/q1UIl6Hwa7ikSDDln1RoigTNkhmA/gu4=", - "sdiff": "sha256-MzenmzkwtgYPddXji+h55kbDaoqRhQ+irK6lnis4bfA=", - "sed": "sha256-KBqc7Wn/gvhDDnDPXoHUqNM6ZhnNb4Y4fAgqhu0kPXE=", - "seq": "sha256-DcKtvIL5zWw5LLPTQVMUR6t2IGxKmM11fGwM9ROpdsA=", - "sha1sum": "sha256-P7qv35CYD8wUMmS0TgWCxGXqLCuqZ4tIA8NneW1vgjY=", - "sha224sum": "sha256-yrsRnVgzIUc8mBzW5b9mQ7h/MNQcbr1bSsPYxvL+2J0=", - "sha256sum": "sha256-YzuzoSIFOfcIc1nNdEvX6qEZDPOOcBvHvDscoCTx5/4=", - "sha384sum": "sha256-iJzxKSJM/0T4qWEmEg5b+/ERcFWl8/R0thACeOKoZyQ=", - "sha512sum": "sha256-b8IP6JlP+V2TH49WQK1nSGKmkZIpE8n1gQ58u1LlapE=", - "shred": "sha256-KRh2h7k7rgdHCHY/GQ+o2fUjvvsjnFTcof8m78MBVFg=", - "shuf": "sha256-65UaXgKGi4ddKECH6N/FYPZM1lypRRnJYQ3d46oFrlM=", - "sleep": "sha256-lJObaM0nIgTI0U9ByONqzS2elutVQnEJqXzETbQDWN8=", - "sort": "sha256-L4zxUq9F/YPcUsUQyyC4mIzTMI4i/0uD0eWF5mecYd4=", - "split": "sha256-zj2SegOKNOiL82gXNeQdvSs2teZAzdv6cekr0zmPH2c=", - "sqlite3": "sha256-8sagxwo5nfoOqMT0rRmEIslMF/kp1IrwvteSw8wZKB8=", - "stat": "sha256-+66YfJ6AdVgjfOi3Qz99csjk+Qf7IbXBspjIdIqY4wA=", - "stty": "sha256-uq8sNP+/KE9rJS+/b0a1rCCNup1dR6cW/5yByBSk2PQ=", - "sum": "sha256-x+4bv7i35PMc1XhVUl0wBdClxTzzC5QZM5zo4HHjmBo=", - "sync": "sha256-KicszdnMhJun42yFvekQ7wBgFP2mi7dyeJomPGarUb0=", - "tac": "sha256-vGu1u4Y+GGgX1mIQxNBWjNCbLQXwF6h/ftHDKNST7Sg=", - "tail": "sha256-7OPlq8ytjpG6GD0awyHk7Qil71ruDgdUEy0JoIhpOhw=", - "tar": "sha256-SwtfS7i76oaz4zdN+Actelz1s8R1iZ2Gp9IAMwmhJfI=", - "tee": "sha256-H8V0IynpFG9vMrIRKY9BMeIaYNlvpRfGU+2EYm9jc58=", - "test": "sha256-/s0AtfcykSlLeXJZoIb9JxKc2MbZQS06MUmIahGI2SI=", - "tidy": "sha256-ayfN+410Ao8n/reseztm1jIc80iZny40rgKKDrCFQcU=", - "timeout": "sha256-/9oLu2p03e0V+GWueBJ6AA+AFyNo32MMHwS7fLIxNW8=", - "tmux": "sha256-4EcvdpcE51XbpXbh47awpBqpFEsimBv4Zl3HnvbPLoY=", - "touch": "sha256-mLKWC7exu0aszUaROz/OoexUMMGWEmYRVKPpGppRGIQ=", - "tr": "sha256-xaojS3Pq3mXcSAYcQCo1L8k56Gm/QQTlLL6oBs1yFZ8=", - "tree": "sha256-ebMnj6nSrhKsDHu7R/7riF1nB8nPBXZbdgFEtuS07KY=", - "true": "sha256-KfGviT7vlB6yA4P9DCkRTmEpzKb2bPoVEwWxeGWpOcE=", - "truncate": "sha256-ZGKgxheM735dAyRF2GmRdukSLe0qhXn1Y3ny5C1weF8=", - "tsort": "sha256-clursf1EKLDsU2EqdtJyT9L0usd630O87+n5xp2Yw+g=", - "tty": "sha256-OrnQlhyckzvw+142u26EhNrmzL20nvl/0U1bxxp6rp4=", - "ttyinfo": "sha256-T/KOlBTQW6zRTsKpCoTEVoyaa6x27UsejIQH1XUsI8Q=", - "unbourne": "sha256-GxVzljrGjc4KjGJvtRQDnkym9UGinxDXCpy3vDon6mY=", - "unexpand": "sha256-Up4wnqEncT/GV+I2tAyLuyC9/PE46e3hljLZpQKfDFY=", - "uniq": "sha256-d05Hb+IYk5ZVYdHukbE1E2W+bbQH8igf9Mvh+Z8OK0U=", - "unlink": "sha256-d/JpS6MFKQ/tDO3SXihxdvWU8qr1bPAoh//JFPVjfqQ=", - "unzip": "sha256-dAGnipkrGNFXsgJM8iFH9i//WPwV4mu23eDUDoRO8dQ=", - "uptime": "sha256-0pYnaQxT9X49n8wz8hYNHxsW93olhBZaomlRTAlf9bw=", - "users": "sha256-75bZkLKnTktbPQJHnfM9NcCsRVBK4kNp40OEy0LLFsg=", - "vdir": "sha256-Ubd+D3L6RiafiBHZPyBgccK0m02JBF7HdwbzHwm+/5k=", - "verynice": "sha256-q+cbgKXWNvqDSfva2gzMu7CxJ0AyeV/DQ9Wy5Y1eDkI=", - "vim": "sha256-iZ/CCJ8kLOeobCWbYK58mdvi+OrKMOWmzGY7ms1s3qM=", - "wall": "sha256-62nKLVSlnc1HPtf+WcQdxzwwXv+WqdYye4v5gYC6Nck=", - "wc": "sha256-DjHLVs2G15jIX98cXEDPpW3ScvdYGK6rKP1q/kXY05o=", - "wget": "sha256-Is/S3Dh1tyLIPdTg1Xj1jqBKSqLzMYOhj1QRkGHsT+s=", - "who": "sha256-Oc4TMSaRZqLyv1n0wtaF0QFUDLVJxDqXxb+a9ueZS6k=", - "whoami": "sha256-LdcXnOrrZG00hLlp4ADCPWV01Q8IEj8/oeBliHqkSzo=", - "xargs": "sha256-p++dx2Lbey44SRdsJ/YSohdxL+hXg7qrrKSTWE7clg0=", - # "xz": "", - "yes": "sha256-diW70D8puIL24VYNbixgWE/qgUKd+wpudMEPvBNaB/U=", - "zip": "sha256-mUCesqrfxIPiJwYdnttMGk4J8iQiWGCQDuEY0n5HIAQ=", - "zsh": "sha256-qDkot+7X4nTkbSXIgcL+9izB2PUoS8a9YbEAcdJteCQ=", - "zstd": "sha256-nbRKCMcul16vz7Oyuu4p/OzRHDUkjLAogL+SQBzd6z0=", + "make": "sha256-FTFzI6IrE9/SE7zkejnTAudAZfQhmd6xfIWFLASTT9k=", + "md5sum": "sha256-Fx+46LQddVtvZZN76NX5x34OTspOssTCee8syQHQ7RM=", + "mkfifo": "sha256-CsqC9AQXvpA2cm2pQ8I9C4JkX+CRa7OUH1z+NBKRe5c=", + "mknod": "sha256-Sw2W/7mL4nooSPqx9vsz293yktSwKGFuUnnc5FT0M/c=", + "mktemp": "sha256-ejsmczZ83ARBUd4GuFC1mPYryiYF1phSF4fBob6YYfQ=", + "mktemper": "sha256-aCf1nzCYMNe80RqIdrOcf5hiQ1UxqmM9Jp9xIUCQF5U=", + "nano": "sha256-xErHGcQXBkybONFvNtgAvwDk0PWWbapaVOPHHhuckfg=", + "nesemu1": "sha256-5qC0v53UmLHwaM00AA5Pbj44PAqTQxSPC/JUIMuHDrM=", + "nice": "sha256-vL/jO27Hfup6jQoWbcjmef04b0iciuab3+ajVtVW8F4=", + "ninja": "sha256-WzMPMduwRVWa009ctNe4DZsgJl4XdPBMH5uFkc9GwoI=", + "nl": "sha256-oAeyiNSxqXUUZZRy5r7GKRgh0M1eepbl2Ylta+lsx9I=", + "nohup": "sha256-Rnnodwi0fKxc8FrJdMt5yjlI3S4mO/4Pxourw/5UlaA=", + "nproc": "sha256-2SAv93hMDWoYMBHWAJbwFGWD3SJhZIlo/o2H7uOz5Ms=", + "numfmt": "sha256-fdJQ3zL43AD1DwotjlOKvjfAILIdO/jWEJtdn72j31M=", + "od": "sha256-BWQ2T4C6OsVrzAvBmAt3aJ/vOLnuzP8+tUqWOfZ261A=", + "paste": "sha256-+8C740XRLTV4mDo2wzbB23HAqENs0FK5hhiSs9PbYNk=", + "patch": "sha256-ukYUTj8GAV/GSmGn8WvJQ/ReecocdG/YeLZtCuB++Ag=", + "pathchk": "sha256-uy/5OqhT3PImWYdIXBn7NgsHwqv3Uc+YIrbgnF0MEb4=", + # "pigz": "sha256-KReMrcHfifpjgxeb/k4WNl6ZtgJwfDIf9mTbcEldR0w=", # 3.2.4 Decompression Issue + "pinky": "sha256-qli+wZ5gRIoi/+H4+GI1l8tMNKjExpKPt85PC7wDzwE=", + "pledge": "sha256-sNeEHKw9HETFu5aN9lAuyLviN5s01BpJ0/nKPbGxDHI=", + "pr": "sha256-62vFsD4Tog38Oh7EkRr7lzr/V3oIKugfUI556xz1k7o=", + "printenv": "sha256-Ct6EjP62+xw3F8w09YRhN9MSwCnqM8Ha4+pbVFo8sTE=", + "printimage": "sha256-AYHGlnWVGnEEwHDstba3aYfPn9cKzWHXbpshDxL7pvY=", + "ptx": "sha256-twijMnCOIIOzUFI1eLJh1PYSfCcMB1o1O0Q2fH1rKbs=", + "pwd": "sha256-08o0YN7YL0Q5Su7KbOImX7nQWTtVJciZTWwMM5QRig8=", + "pypack1": "sha256-cBVecPuuIryyJaocgzxR1oqaVQTbv1pGoWKk/8knOQE=", + "python": "sha256-T6FIjES6w0etlU/IfwqyiGU9QQdRf0AjMRSoapeNJ6k=", + # "qjs": "sha256-dgblh0J7T6VumjgCrL0PPJAUIzrqGFw9oqoYSO+g39o=", # 3.3.1 + "readlink": "sha256-MI9wEtnYKtlfRj+zIfgicwBuyYSOJ3FrgT2/w+rCCBo=", + "realpath": "sha256-djXjxbqQ56fyZVpnlPsvskJGZC581i4g5nEdD/Wuyyo=", + "redbean": "sha256-SJxd4sQY8wu1Jb77hA8qk+nOeh9YglqkOTyQezLE4BI=", + "rmdir": "sha256-1+I+vLzVrVfXAMDzAYc05kSjuIlrFJ1PudkZ/KU7Dko=", + "rsync": "sha256-ZVRFw75cyN2Ned/tvesE1IjoCn1nUw/yHnzw0Pq3xrg=", + "runcon": "sha256-oA0CCpVZm6y51j6+0yNOtlec+k7H8+/zBLOmyF+N2+M=", + "script": "sha256-w2yyLAV2JWv5z4qqJN0214ED2zQnZFPd58UdEsLepZ0=", + "sdiff": "sha256-/t8hOtFXYnQKptaf3xRXIB/3/vg2ocxa/110AppUUWw=", + "sed": "sha256-ND8AuTc51P8UXETiigeIlZFCXLdmvPfZ5FNHCNb8bNg=", + "seq": "sha256-Y87Awa/Ue1TY7NQxkDf3wvtfIXsJIgSgxzwS3N4acE4=", + "sha1sum": "sha256-YlDj7fhm18dMss2XKda5ZrnMhsjHec5QWrnWUOyvYdI=", + "sha224sum": "sha256-nyA69MCwsGeR97YTJal8u2F5Umq2sutlNxNeueBpjK8=", + "sha256sum": "sha256-ABL1gN60Mcos5o8Fjlgx4DfIaDnyjeWKbxl6JC6mKkw=", + "sha384sum": "sha256-5bV3dxN5sD9L5J7LNRzGQLVBpstV/WduqWKs1JQgdiU=", + "sha512sum": "sha256-+yabABL8o9ry2zhEZ1Wr7JR3nZGKbxnwdW6QPssmVnU=", + "shred": "sha256-baVjjy1hCOmd+QZApHkaLHluFgTM9HyDvZZAaXR57cY=", + "shuf": "sha256-iB9q96mLSvtzUa4w2i5wMBeqmkhcedHzW/THPjD0Onk=", + "sleep": "sha256-htlrLcdfqBpXJ7GqxwTlJzU9WDQQOcVwPizoWSS5qYw=", + "sort": "sha256-4q/DnLEhJXZ1lv5QPHRmpag0cPOYNzGpwIdO2f54qkE=", + "split": "sha256-N+xpjirg0biHz+yCvTqJ4uGo0xhzmZvhMydUTvEC4mo=", + "sqlite3": "sha256-bcXH977rlATa8BU7Lk58kE31LN9N2DOnW1X9QyBIn6o=", + "stat": "sha256-3gBlScuYiPySCo9d4Tc87I6Bml6DjG3zmCUy1f86/Dk=", + "stty": "sha256-tQ0MHFvHCI/XNgvXqwhQRL//5AeBEDm/Npv3bZ1Bqck=", + "sum": "sha256-RALvzDS8wEY0ZMzlNK9ItnvD4aI8C5hdanVcec1D/rQ=", + "sync": "sha256-InrCxoogK8/2Vcwl4yydSRTirQ6bP6KQTPFl6EE2uaQ=", + "tac": "sha256-SMQzsXwQLHNbqNaWvDStEwVOSW4M413iVZU9AtAoydw=", + "tail": "sha256-7OrgrcdXp9G/rmbbkXz+c9E6NkmxnXKAh65vByeYj2o=", + "tar": "sha256-z2bsjSAXVIm2RV5Xa0sHmHtXSYH8dH49pVKXnVgvbwI=", + "tee": "sha256-ruwn8Pc8oOArrW9PF/yugXgpb/PvChrBMi6N9CYzprs=", + "test": "sha256-wFtpsEdV1mZsMg43B7R4IW4Yt3AjFVpi5b2BLOb3V0Q=", + "tidy": "sha256-Pqg3qCr/n40gW2tBGjHF7fHF9fLlnUTS4tynEiwtgaY=", + "timeout": "sha256-MXoaW9GINC23QDgjnNqt5z7KUPaY7y1tP00MdLd8aNI=", + # "tmux": "sha256-4EcvdpcE51XbpXbh47awpBqpFEsimBv4Zl3HnvbPLoY=", # 3.9.2 + "touch": "sha256-q55ovUGSqpvS7VfrUa2ZNXMC+jdAENE31P6jA1DhtEA=", + "tr": "sha256-7Qfixr12DeNVWnMWKKYLZHHAI8EWMQv3yFr9Je/lGUE=", + "tree": "sha256-xzqnvIrU12cECjI+8ti66ExmMVRULWS4iGGMYV0+cQ8=", + "true": "sha256-LvF7GQGaDzVJc2V2svaHcWQfgchD51C8U4Ma7foVHP0=", + "truncate": "sha256-bLKwPFlG6+FOrOz8zECEC+ldVNoI6iYn3jJ6tLaY+cw=", + "tsort": "sha256-n4zwlXuDiFK6eBjs749Sm0nUyC/YKpXinvEzNvXJI9w=", + "tty": "sha256-4Efm98bjiwiqhpgjv5nBVaCQO87j+rDG2xRA7U05cHQ=", + "ttyinfo": "sha256-zVwebCMjpVAyuYJmMn8K1GfonjA5DYWNxTkSFb+tQ7I=", + # "unbourne": "sha256-GxVzljrGjc4KjGJvtRQDnkym9UGinxDXCpy3vDon6mY=", # 3.9.2 + "unexpand": "sha256-3AkWs0+MDaHxe3lCfqiUXJzR+kU8Ku4TfUJhwuZCIjM=", + "uniq": "sha256-fBl0w9XdaSjD7tFa7IyR6Ljc1OSc9r+b6HFnbtU+B24=", + "unlink": "sha256-fwcM91DDHicw6+G1ZOBUMnQpDCW+vCwNHE90nHeP++k=", + "unzip": "sha256-6WdA8Qt3PBWNRxAnKFzGlNQQ+Th7wgbJPlvQdSOP6tY=", + "uptime": "sha256-jQqvqAKeNRWWRAE8sg3jjz9IAu8UGjbBeDMhq9cZ/MM=", + "users": "sha256-JgL9LVOAj7ghin/zXLc9KW5/JhRp7aghIPF31yXjnY8=", + "vdir": "sha256-xZpxg16ya89LHMO+QRtXJRnYJmvwKf0RJUkdOtaKvLU=", + "verynice": "sha256-cYeNjW7vLc2X+W8U1bUtSn/25CjFLtqhyL5gOcnSAQY=", + "vim": "sha256-pA8QZGE0CPqG0GnfzbjGQHfm59IxybCqGpHMKIa98pE=", + "wall": "sha256-WzU8WAN0p158lR1tPguxSZFtkZGA9C/Bd+a21qClWYg=", + "wc": "sha256-cgGJek5nYKF2jmcalth3vTS/fU6yoo93IjuH/TThPRQ=", + "wget": "sha256-I6w9CRE7hZsVuIXQLsvgGvCHslSrrEx0sLlXcKA8wr8=", + "who": "sha256-mNf/+ZYV1fXZy2GimL0USIl/zQwklPpddX6pdMJ8eHY=", + "whoami": "sha256-6CoeXfms4Uu2Z8Ex1vPmWSfyx2stzdQNjhodRnKnVqc=", + "xargs": "sha256-ZJJFxPHtmEmGRICKIVaZA4W9scLpMc5+7swbrRq0os4=", + # "xz": "sha256-84VVLEvkMFVKsNTKX8IZ90XAqebHofJ4bsy3J3f+Xe0=", # 3.3.1 + "yes": "sha256-kSS7hzKeG6wi7hUj4d21LzrA1SWFTKPZLPKFMdR7CMc=", + "zip": "sha256-Z0H+rSfWQxk5kh51+GtC8dw+Oi7IqCsxSQdHGFx7k0k=", + "zsh": "sha256-/SnDVfM9ilBvfqynqOtWfCOUEhk1jUq3VdMjVwU54EI=", + "zstd": "sha256-EAhul2LIsUJxmpwkE5eLH3saYNN/uKkpp5B4TH9tBmQ=", }.items() ] @@ -297,8 +297,44 @@ export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain integrity = integrity, output = binary, urls = [ - "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmo.zip/3.9.2/{}".format(binary), - "https://cosmo.zip/pub/cosmos/v/3.9.2/bin/{}.ape".format(binary), + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2/{}".format(binary), + "https://cosmo.zip/pub/cosmos/v/4.0.2/bin/{}.ape".format(binary), + ], + ), + ape_entrypoint( + name = binary, + binary = "@cosmos-{}//:{}".format(binary, binary), + ), + export.symlink( + name = "ape-{}".format(binary), + target = "@{}".format(binary), + ), + ) + for binary, integrity in { + "chmod": "sha256-QhMeGeXNj8KqDw9PflQTQb9Vr8OJbxVOOPGJm+OWi70=", + "cp": "sha256-cCroQPgzo1Hl9qIfZg/a2rNKnJIgHE3NvXVbYVVoLzo=", + "dd": "sha256-PS/hQKT+AOQh5AHolWj3q0WNks39tCO7Hovi0RDEOZE=", + "echo": "sha256-2LpfMxMJYMbL4fepWhIp6Em08hBu4twQRbT1Gy0agPE=", + "gzip": "sha256-xLlIpb77H8i9tdgIY25pkBIj4BhIw4pWucYhlbdDzf8=", + "mkdir": "sha256-eFfD2zKsAEfAtkQdS8VVanoGw/oi3BzltzQRHoUMAAo=", + "mv": "sha256-MplEA+5gkOu/Zk1oCIAJFBiOFx0JjdeutSaG0R9XyxM=", + "printf": "sha256-T5Ifxr+65C9992N7pZ6IkY89COwzDhD7hyMBfEYnNcQ=", + "rm": "sha256-VOcVdnxjBHJh9xxaxau7PoD+ALd8POnk7J+JrEQm5gI=", + "uname": "sha256-rxBBaweJRG1GSz753V13tTH8wGPl0INSQqS12X3mPbo=", + }.items() +] + +# 3.9.2 downloads +[ + ( + download_file( + name = "cosmos-{}".format(binary), + executable = True, + integrity = integrity, + output = binary, + urls = [ + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.9.2/{}".format(binary), + "https://cosmo.zip/pub/cosmos/v/3.9.2/bin/{}".format(binary), ], ), ape_entrypoint( @@ -311,16 +347,9 @@ export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain ), ) for binary, integrity in { - "chmod": "sha256-3ydPcDwrGvz/xmt6HXwYhBGfgVNG0tasQb5BDSw860Y=", - "cp": "sha256-511WXEuJff/5X/8rF7efcLG2cjTxQQGwdOyjooSNqQU=", - "dd": "sha256-PmHUlShDoAwUco6Iak303nWkCQq+rMk5WuscZ/O17co=", - "echo": "sha256-87E12HVQEpW5EZF27e9IlHXvzjsVXiV/0clgjvcnps0=", - "gzip": "sha256-NvJw2tDrkwXfLlMfix4jbehrLKQZMWW5/eDTV5KPBOo=", - "mkdir": "sha256-SBhdc+2GsvY6mCIwXv+KwLtMxaWA/oLdSv4IV0a7MRY=", - "mv": "sha256-Vn8o8UHlwN0//u6+3Ig6LoQoCKsv1aSsKfyvvZ5fYac=", - "printf": "sha256-bFvI6MLKMnurC2yublR9lAZBNmbaPPzTb3xklihNhHE=", - "rm": "sha256-79Qg+1douroAyaD5tyC6GNPDFItHqfvR6xwUAYfmE+M=", - "uname": "sha256-ijlUk7XJZ/pMoBAkoeOnDu7LBrUrgO00U3+sobe6ZC0=", + # TODO: remove these when future versions make them available + "tmux": "sha256-4EcvdpcE51XbpXbh47awpBqpFEsimBv4Zl3HnvbPLoY=", + "unbourne": "sha256-GxVzljrGjc4KjGJvtRQDnkym9UGinxDXCpy3vDon6mY=", }.items() ] @@ -333,7 +362,7 @@ export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain integrity = integrity, output = binary, urls = [ - "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmo.zip/3.2.4/{}".format(binary), + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.2.4/{}".format(binary), "https://cosmo.zip/pub/cosmos/v/3.2.4/bin/{}".format(binary), ], ), @@ -362,7 +391,7 @@ export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain integrity = integrity, output = binary, urls = [ - "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmo.zip/3.3.1/{}".format(binary), + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.3.1/{}".format(binary), "https://cosmo.zip/pub/cosmos/v/3.3.1/bin/{}".format(binary), ], ), @@ -378,7 +407,6 @@ export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain for binary, integrity in { # TODO: remove these when future versions make them available "qjs": "sha256-dgblh0J7T6VumjgCrL0PPJAUIzrqGFw9oqoYSO+g39o=", - "rsync": "sha256-IpC+6WKlj7EqkYxNXXDdO7IaF1/jTItBvlSKr0MdNIk=", "xz": "sha256-84VVLEvkMFVKsNTKX8IZ90XAqebHofJ4bsy3J3f+Xe0=", }.items() ] diff --git a/binaries.bzl b/binaries.bzl index 975d703c..67b221fe 100644 --- a/binaries.bzl +++ b/binaries.bzl @@ -23,6 +23,7 @@ BINARIES = ( "cmp", "comm", "cp", + "cpuid", "csplit", "ctags", "curl", @@ -62,11 +63,13 @@ BINARIES = ( "less", "life", "link", + "links", "ln", "locate", "logname", "ls", "lua", + "lz4", "make", "md5sum", "mv", @@ -96,6 +99,7 @@ BINARIES = ( "printimage", "ptx", "pwd", + "pypack1", "python", "qjs", "readlink", @@ -141,6 +145,7 @@ BINARIES = ( "tty", "ttyinfo", "uname", + "unbourne", "unexpand", "uniq", "unlink", diff --git a/upload/BUILD.bazel b/upload/BUILD.bazel index f3fdc34e..9d6c401a 100644 --- a/upload/BUILD.bazel +++ b/upload/BUILD.bazel @@ -7,7 +7,7 @@ load("//:binaries.bzl", "BINARIES") src = "@{}//:ape".format(ape), dst = ape, tags = ["manual"], - url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.9.2", + url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2", ) for ape in ( "ape-arm64.elf", @@ -22,7 +22,7 @@ load("//:binaries.bzl", "BINARIES") src = "@cosmos-{}//:{}".format(binary, binary), dst = binary, tags = ["manual"], - url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.9.2", + url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2", ) for binary in BINARIES ] @@ -32,5 +32,5 @@ curl_upload_file( src = "@ape-m1.c", dst = "ape-m1.c", tags = ["manual"], - url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.9.2", + url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2", ) -- GitLab From dad525c46a23f37c701496c7cdedf99f0c5b1703 Mon Sep 17 00:00:00 2001 From: Jordan Bonser Date: Wed, 15 Jan 2025 15:37:23 +0000 Subject: [PATCH 2/4] ci: update bazelick ci ruleset to 1.2.0 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 350f56a2..66a1d30d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ include: - - component: "${CI_SERVER_HOST}/ci/component/bazelisk/ruleset@v1.0.0" + - component: "${CI_SERVER_HOST}/ci/component/bazelisk/ruleset@v1.2.0" default: tags: -- GitLab From d60156cae91bb5cbf71cf15d5cf9dcdf83cc4792 Mon Sep 17 00:00:00 2001 From: Jordan Bonser Date: Wed, 15 Jan 2025 17:03:51 +0000 Subject: [PATCH 3/4] fix: revert ape-m1.c package update --- CONTRIBUTING.md | 4 ++-- MODULE.bazel | 6 +++--- upload/BUILD.bazel | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82ffa19f..c6120e46 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,9 +38,9 @@ rather than our internal gitlab package registry. Then run following script in a POSIX shell: ```console # Clear out all integrities -sed -i 's|"\([a-z0-9-]\+\)": "sha256.\+",|"\1": "",|g' MODULE.bazel +sed -i 's|"\([a-z0-9-].\+\)": "sha256.\+",|"\1": "",|g' MODULE.bazel # Run a fetch and update integrity -for BINARY in $(rg --no-line-number '^ +"([a-z0-9-]+)": "",' -or '$1' MODULE.bazel); do +for BINARY in $(rg --no-line-number '^ +"([a-z0-9-].+)": "",' -or '$1' MODULE.bazel); do INTEGRITY="$(bazelisk fetch @${BINARY}//:entrypoint 2>&1 | rg -o 'sha256-[^"]+')" echo "${BINARY}: ${INTEGRITY}" sed -i "s|\"${BINARY}\": \"\",|\"${BINARY}\": \"${INTEGRITY}\",|" MODULE.bazel diff --git a/MODULE.bazel b/MODULE.bazel index fa77bb78..c7e10a21 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -47,9 +47,9 @@ download_file( integrity = "sha256-eK954gq7s/malzVZWbWb1YlJVkBkrbdU8DAuurtL96M=", output = "ape-m1.c", urls = [ - "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2/ape-m1.c", - "https://cosmo.zip/pub/cosmos/v/4.0.2/bin/ape-m1.c", - "https://raw.githubusercontent.com/jart/cosmopolitan/4.0.2/ape/ape-m1.c", + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.9.2/ape-m1.c", + "https://cosmo.zip/pub/cosmos/v/3.9.2/bin/ape-m1.c", + "https://raw.githubusercontent.com/jart/cosmopolitan/3.9.2/ape/ape-m1.c", ], ) diff --git a/upload/BUILD.bazel b/upload/BUILD.bazel index 9d6c401a..c067a894 100644 --- a/upload/BUILD.bazel +++ b/upload/BUILD.bazel @@ -32,5 +32,5 @@ curl_upload_file( src = "@ape-m1.c", dst = "ape-m1.c", tags = ["manual"], - url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2", + url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.9.2", ) -- GitLab From 5a0aa2d686e5457e56d2052d7d1bda497c23679d Mon Sep 17 00:00:00 2001 From: Jordan Bonser Date: Tue, 21 Jan 2025 11:33:37 +0000 Subject: [PATCH 4/4] fix: used github raw content 4.0.2 for ape-m1.c the ape-m1.c was not available in the cosmo repo but it has been uploaded to Github so we use that version instead and upload to our package registry. --- MODULE.bazel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index c7e10a21..54f21004 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -47,9 +47,9 @@ download_file( integrity = "sha256-eK954gq7s/malzVZWbWb1YlJVkBkrbdU8DAuurtL96M=", output = "ape-m1.c", urls = [ - "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.9.2/ape-m1.c", - "https://cosmo.zip/pub/cosmos/v/3.9.2/bin/ape-m1.c", - "https://raw.githubusercontent.com/jart/cosmopolitan/3.9.2/ape/ape-m1.c", + "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2/ape-m1.c", + # "https://cosmo.zip/pub/cosmos/v/3.9.2/bin/ape-m1.c", # ape-m1.c 4.0.2 not in cosmo repo + "https://raw.githubusercontent.com/jart/cosmopolitan/4.0.2/ape/ape-m1.c", ], ) -- GitLab