From 7947ae55ff0e5c982c2ae5bcdea160fd21ef563b Mon Sep 17 00:00:00 2001 From: Max Howell Date: Fri, 5 Jan 2024 07:59:26 -0500 Subject: [PATCH] Bump to libpkgx 0.16 * Will fix some errors due to invalid pantry parsing * Removes platform specific moustaches devenvs * these weren't documented so even though this is strictly a breaking change I would be willing to risk the tea protocol slash consequences for it in a tea protocol future * there is potential utility in platform/arch being there so we should propose a proper addition * Fix CD Refs #882 Refs #865 --- .github/workflows/cd.yml | 4 ++-- deno.jsonc | 6 +++--- deno.lock | 46 ++++++++++++++++++++++++++++++++++++++++ src/utils/devenv.ts | 2 +- 4 files changed, 52 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 42e4ec92..edc59cb4 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -76,10 +76,10 @@ jobs: with: name: srcs - - run: tar xJf pkgx-${{ github.event.inputs.version }}.tar.xz --strip-components=1 - - uses: pkgxdev/dev@v0 + - run: pkgx +xz tar xJf pkgx-${{ github.event.inputs.version }}.tar.xz --strip-components=1 + - run: deno task compile - uses: pkgxdev/brewkit/actions/setup-codesign@v0 diff --git a/deno.jsonc b/deno.jsonc index 2f1742d5..d9343ebc 100644 --- a/deno.jsonc +++ b/deno.jsonc @@ -32,10 +32,10 @@ }, "imports": { "is-what": "https://deno.land/x/is_what@v4.1.15/src/index.ts", - "pkgx": "https://deno.land/x/libpkgx@v0.15.2/mod.ts", - "pkgx/": "https://deno.land/x/libpkgx@v0.15.2/src/", + "pkgx": "https://deno.land/x/libpkgx@v0.16.0/mod.ts", + "pkgx/": "https://deno.land/x/libpkgx@v0.16.0/src/", "outdent": "https://deno.land/x/outdent@v0.8.0/mod.ts", "cliffy/": "https://deno.land/x/cliffy@v1.0.0-rc.3/", - "deno/": "https://deno.land/std@0.204.0/" + "deno/": "https://deno.land/std@0.204.0/" // cliffy is on 196, try to consolidate to their choice } } diff --git a/deno.lock b/deno.lock index 442682ea..7b359645 100644 --- a/deno.lock +++ b/deno.lock @@ -232,7 +232,25 @@ "https://deno.land/std@0.204.0/assert/unreachable.ts": "4600dc0baf7d9c15a7f7d234f00c23bca8f3eba8b140286aaca7aa998cf9a536", "https://deno.land/std@0.204.0/bytes/concat.ts": "d26d6f3d7922e6d663dacfcd357563b7bf4a380ce5b9c2bbe0c8586662f25ce2", "https://deno.land/std@0.204.0/bytes/copy.ts": "939d89e302a9761dcf1d9c937c7711174ed74c59eef40a1e4569a05c9de88219", + "https://deno.land/std@0.204.0/crypto/_fnv/fnv32.ts": "e4649dfdefc5c987ed53c3c25db62db771a06d9d1b9c36d2b5cf0853b8e82153", + "https://deno.land/std@0.204.0/crypto/_fnv/fnv64.ts": "bfa0e4702061fdb490a14e6bf5f9168a22fb022b307c5723499469bfefca555e", + "https://deno.land/std@0.204.0/crypto/_fnv/mod.ts": "f956a95f58910f223e420340b7404702ecd429603acd4491fa77af84f746040c", + "https://deno.land/std@0.204.0/crypto/_fnv/util.ts": "accba12bfd80a352e32a872f87df2a195e75561f1b1304a4cb4f5a4648d288f9", + "https://deno.land/std@0.204.0/crypto/_wasm/lib/deno_std_wasm_crypto.generated.mjs": "e0e4f9952f7ad3cbcc63a04e49865e7f6355cb830c593c3f5a3fc731bebbfa7d", + "https://deno.land/std@0.204.0/crypto/_wasm/mod.ts": "c4386f0ee80968faa82079cc21066aba2147bd6ca74ae45f1478fca7dbca804a", + "https://deno.land/std@0.204.0/crypto/crypto.ts": "e040c130e22b6c8b416bf4073be1cc94c53c57a2a29f75ce8c29c37745d13cc3", + "https://deno.land/std@0.204.0/crypto/keystack.ts": "cec9ddf60e0c0c9970360e66c9402afb3c0c68bcd50ef19c68daf63f94e40863", + "https://deno.land/std@0.204.0/crypto/mod.ts": "ae384519e85eca9aeff4e7111ed153df8f3dbda7b35b70850ed4b3e9c8cec4d5", + "https://deno.land/std@0.204.0/crypto/timing_safe_equal.ts": "f6edc08d702f660b1ab3505b74d53a9d499e34a1351f6ab70f5ce8653fee8fb7", + "https://deno.land/std@0.204.0/crypto/to_hash_string.ts": "c78050f72a9d4a690d85e83a85a43c2951d23a04d5b2a4537b2ebc00854421be", + "https://deno.land/std@0.204.0/crypto/unstable/keystack.ts": "624c2f2d8fa6711d44fcb8fbca346e7fb56afa7aa3fcf2d8e6db32978e9fbac2", + "https://deno.land/std@0.204.0/encoding/_util.ts": "f368920189c4fe6592ab2e93bd7ded8f3065b84f95cd3e036a4a10a75649dcba", + "https://deno.land/std@0.204.0/encoding/base64.ts": "cc03110d6518170aeaa68ec97f89c6d6e2276294b30807e7332591d7ce2e4b72", + "https://deno.land/std@0.204.0/encoding/base64url.ts": "7608862858d28a003f9d6cb78dd61e645ecd1ae1f45faf0e09a306eafe66b16e", + "https://deno.land/std@0.204.0/encoding/hex.ts": "d41e9c3f7dd9d4738c40c2b9e6db5eb32e9dc103360291aff63a5c3fccdb45a6", "https://deno.land/std@0.204.0/fmt/colors.ts": "c51c4642678eb690dcf5ffee5918b675bf01a33fba82acf303701ae1a4f8c8d9", + "https://deno.land/std@0.204.0/fs/_util.ts": "fbf57dcdc9f7bc8128d60301eece608246971a7836a3bb1e78da75314f08b978", + "https://deno.land/std@0.204.0/fs/move.ts": "b4f8f46730b40c32ea3c0bc8eb0fd0e8139249a698883c7b3756424cf19785c9", "https://deno.land/std@0.204.0/io/buf_reader.ts": "f7a43953b05eecbaea56ebcb654035bc91e117d6986a0b2d346c1d0de1d4dac4", "https://deno.land/std@0.204.0/io/buffer.ts": "2108faba32659e5a390bb59b1b4578ff0120b185d9310dd6fbf3b3a3d5775715", "https://deno.land/std@0.204.0/io/read_lines.ts": "8d09daed983812ef4cee6e5333633e789673aeecbe109da09d281d4ceaf75d5c", @@ -406,6 +424,34 @@ "https://deno.land/x/libpkgx@v0.15.0/src/utils/misc.ts": "a4d7944da07066e5dd2ef289af436dc7f1032aed4272811e9b19ceeed60b8491", "https://deno.land/x/libpkgx@v0.15.0/src/utils/pkg.ts": "5ef9cc1955a5067489ac4d2af8615652505cb17a48745e811cb786ab89377547", "https://deno.land/x/libpkgx@v0.15.0/src/utils/semver.ts": "defa0cc3f08059189d47e5c3600c640fdf16cc555c7c81c3b72de5d1f4180307", + "https://deno.land/x/libpkgx@v0.16.0/mod.ts": "14a69905ffad8064444c02d146008efeb6a0ddf0fe543483839af18e01684f5a", + "https://deno.land/x/libpkgx@v0.16.0/src/deps.ts": "6ce708d6ceed8617b7de363421f478aa48d913dc3d2b9b0fe67c7b9eef779213", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/useCache.ts": "9f3cc576fabae2caa6aedbf00ab12a59c732be1315471e5a475fef496c1e35ae", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/useCellar.ts": "c1e264fcb732423734f8c113fc7cb80c97befe8f13ed9d24906328bc5526c72d", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/useConfig.ts": "c29d8f9c6dc7b5289c485b3ff37a6e0f04d9a51031813e892015e69afc512a64", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/useDownload.ts": "62b2043fcbc06a0925eb06fc5ed5f2f2ef3779e8ce10bc44b0163e9bd9b8cbc0", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/useFetch.ts": "ecf29342210b8eceed216e3bb73fcc7ea5b3ea5059686cf344ed190ca42ff682", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/useInventory.ts": "39b022ee12443bb0bc6c8755eda860a227dba131a439ea0e043bae6132ece34b", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/useMoustaches.ts": "e9166ddace759315782be0f570a4cd63c78e3b85592d59b75ddd33a0e401aa6b", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/useOffLicense.ts": "9a7a35bd83a8dbb5a25d532e2ab885b5fb77101cc38fad10c5f3ea6a49a24e02", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/usePantry.ts": "cdbc3bd1abf41eb2d7369fdc6adf1fe9baca0fc8f3df5aac23fa64730972d821", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/useShellEnv.ts": "14d29f23b8e256590318cfd5fb840955038429c4cac8f71dfbf8deb46b7d88ec", + "https://deno.land/x/libpkgx@v0.16.0/src/hooks/useSync.ts": "c098321da6c59126a3b8150bcea5e6fc43348c00810ba6db88ce4f5de0fdb556", + "https://deno.land/x/libpkgx@v0.16.0/src/plumbing/hydrate.ts": "74f295585c4760005cc7676db9f3d9eb67d92b78e197e02445f42823d1643884", + "https://deno.land/x/libpkgx@v0.16.0/src/plumbing/install.ts": "19244fb150e80a0bbbed90e4a3f47e2c5aa3e0919ff060cec1db0b789730b560", + "https://deno.land/x/libpkgx@v0.16.0/src/plumbing/link.ts": "acb98bf014414208f14c5f57fa36e2aa66ae9bee69d763120c3ddb656e244063", + "https://deno.land/x/libpkgx@v0.16.0/src/plumbing/resolve.ts": "9425e0d201ee440a8dc011940046f0bb6d94aa29cd738e1a8c39ca86e55aad41", + "https://deno.land/x/libpkgx@v0.16.0/src/plumbing/which.ts": "24778f645c9aaea67df51b671474fffe01c1d3b188552943e24d61d51fa6b80d", + "https://deno.land/x/libpkgx@v0.16.0/src/porcelain/install.ts": "6e41d94226b8eb33a9fbb591e5ddd95e2c5e0c2449cc617ac5f365746d1e4592", + "https://deno.land/x/libpkgx@v0.16.0/src/porcelain/run.ts": "20c60bebeca51daf12d9e5baefe8670844162308734f8a189a1f484c4155d671", + "https://deno.land/x/libpkgx@v0.16.0/src/types.ts": "dc1a4e6458d11454282f832909838c56f786a26eed54fb8ab5675d6691ebf534", + "https://deno.land/x/libpkgx@v0.16.0/src/utils/Path.ts": "72bbb8afa6a40e3cfbf01d4d9069e0818e7abaf0021703a20b0677f06c01e883", + "https://deno.land/x/libpkgx@v0.16.0/src/utils/error.ts": "b0d3130f5cdfc0cc8ea10f93fea0e7e97d4473ddc9bc527156b0fcf24c7b939c", + "https://deno.land/x/libpkgx@v0.16.0/src/utils/flock.deno.ts": "f91792244734befb21c1caa10ac4908694dd37b44f0e9748c78c4f1aa003eb7a", + "https://deno.land/x/libpkgx@v0.16.0/src/utils/host.ts": "3b9e0d4cb05f9bde0ee8bcb0f8557b0a339f6ef56dfb1f08b2cfa63b44db91ee", + "https://deno.land/x/libpkgx@v0.16.0/src/utils/misc.ts": "a4d7944da07066e5dd2ef289af436dc7f1032aed4272811e9b19ceeed60b8491", + "https://deno.land/x/libpkgx@v0.16.0/src/utils/pkg.ts": "5ef9cc1955a5067489ac4d2af8615652505cb17a48745e811cb786ab89377547", + "https://deno.land/x/libpkgx@v0.16.0/src/utils/semver.ts": "eec31f4345ea483eac7e0fbfdcc0061499077df03c4b6ec7666cd0d29c6cab98", "https://deno.land/x/outdent@v0.8.0/mod.ts": "72630e680dcc36d5ae556fbff6900b12706c81a6fd592345fc98bcc0878fb3ca", "https://deno.land/x/outdent@v0.8.0/src/index.ts": "6dc3df4108d5d6fedcdb974844d321037ca81eaaa16be6073235ff3268841a22", "https://deno.land/x/semver@v1.4.1/mod.ts": "0b79c87562eb8a1f008ab0d98f8bb60076dd65bc06f1f8fdfac2d2dab162c27b", diff --git a/src/utils/devenv.ts b/src/utils/devenv.ts index a4882eec..f4d992e9 100644 --- a/src/utils/devenv.ts +++ b/src/utils/devenv.ts @@ -308,7 +308,7 @@ export default async function(dir: Path) { //TODO deprecate moustaches and instead use env vars const foo = [ - ...moustaches.tokenize.host(), + //FIXME ...moustaches.tokenize.host(), { from: "home", to: Path.home().string }, //TODO deprecate and use $HOME once pantry is migrated { from: "srcroot", to: dir.string } //TODO deprecate and use $PWD once pantry is migrated ]