Merge branch 'main' into ctrl+c-bk-docker

felipecrs · web-flow · commit ca56d1f41d06 · 2025-05-24T00:29:27.000-03:00
diff --git a/.github/workflows/ci.actions.yml b/.github/workflows/ci.actions.yml
@@ -14,8 +14,10 @@ jobs:
         platform:
           - os: ubuntu-latest
             name: linux
+            arch: x86-64
           - os: macos-latest
             name: darwin
+            arch: aarch64
     steps:
       - uses: actions/checkout@v4
         with:
@@ -32,7 +34,7 @@ jobs:
       - run: test ${{ steps.build.outputs.project }} = stark.com/foo
       - run: test ${{ steps.build.outputs.version }} = 2.3.4
       - run: test ${{ steps.build.outputs.platform }} = ${{ matrix.platform.name }}
-      - run: test ${{ steps.build.outputs.arch }} = x86-64
+      - run: test ${{ steps.build.outputs.arch }} = ${{ matrix.platform.arch }}
       - run: test -d ${{ steps.build.outputs.prefix }}
       - run: test $BREWKIT_PKGSPEC = ${{ steps.build.outputs.pkgspec }}
       - run: test $BREWKIT_PREFIX = ${{ steps.build.outputs.prefix }}
@@ -44,7 +46,7 @@ jobs:
     strategy:
       matrix:
         platform-key:
-          - darwin+x86-64
+          - darwin+aarch64
           - null
     runs-on: ubuntu-latest
     env:
@@ -91,7 +93,7 @@ jobs:
       matrix:
         compression: [xz, gz]
         platform:
-          - darwin+x86-64
+          - darwin+aarch64
           - linux+x86-64
     env:
       PKGX_PANTRY_PATH: ${{github.workspace}}/co
diff --git a/.github/workflows/ci.cli.yml b/.github/workflows/ci.cli.yml
@@ -35,9 +35,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pkgxdev/setup@v2
 
-      - name: precache  # makes it easier to read the real output
-        run: pkgx deno cache test/test.ts build/build.ts
-
       - run: bin/bk build ${{matrix.pkg}}
       - run: bin/bk test ${{matrix.pkg}}
       - run: bin/bk audit ${{matrix.pkg}}
diff --git a/audit/action.yml b/audit/action.yml
@@ -26,7 +26,7 @@ runs:
       run: |
         echo "::group::fetch deno deps"
         cd $GITHUB_ACTION_PATH
-        pkgx deno cache ./audit.ts
+        pkgx deno^1 cache ./audit.ts
         echo "::endgroup::"
 
     - run: ${GITHUB_ACTION_PATH}/audit.ts '${{ inputs.pkg }}'
diff --git a/audit/audit.ts b/audit/audit.ts
@@ -1,4 +1,4 @@
-#!//usr/bin/env -S pkgx +git +gh deno run --allow-env --allow-read --allow-run --allow-net --ext=ts
+#!//usr/bin/env -S pkgx +git +gh deno^1 run --allow-env --allow-read --allow-run --allow-net --ext=ts
 
 import { Command } from "cliffy/command/mod.ts"
 import { swallow } from "brewkit/utils.ts"
diff --git a/bin/bk-edit b/bin/bk-edit
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx +deno +git bash
+#!/usr/bin/env -S pkgx +deno^1 +git bash
 
 set -eo pipefail
 
diff --git a/build/action.yml b/build/action.yml
@@ -49,7 +49,7 @@ runs:
       run: |
         echo "::group::fetch deno deps"
         cd $GITHUB_ACTION_PATH
-        pkgx deno cache ./build.ts
+        pkgx deno^1 cache ./build.ts
         echo "::endgroup::"
 
     - name: build
diff --git a/build/build.ts b/build/build.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx +rsync +git +bash +gum +gh +curl +bzip2 +xz +unzip +lzip +column deno run --ext=ts --allow-env --allow-read --allow-write --allow-run --allow-net
+#!/usr/bin/env -S pkgx +rsync +git +bash +gum +gh +curl +bzip2 +xz +unzip +lzip +column deno^1 run --ext=ts --allow-env --allow-read --allow-write --allow-run --allow-net
 
 import make_build_script from "brewkit/porcelain/build-script.ts"
 import { gum, rsync } from "brewkit/utils.ts"
diff --git a/download-build-artifact/action.yml b/download-build-artifact/action.yml
@@ -52,7 +52,7 @@ runs:
       shell: bash
       run: |
         echo "::group::fetch deno deps"
-        pkgx deno cache ${GITHUB_ACTION_PATH}/../lib/actions/*.ts --config=${GITHUB_ACTION_PATH}/../deno.jsonc
+        pkgx deno^1 cache ${GITHUB_ACTION_PATH}/../lib/actions/*.ts --config=${GITHUB_ACTION_PATH}/../deno.jsonc
         echo "::endgroup::"
 
     - name: prep
diff --git a/id/action.yml b/id/action.yml
@@ -40,7 +40,7 @@ runs:
       run: |
         echo "::group::fetch deno deps"
         cd ${GITHUB_ACTION_PATH}
-        pkgx deno cache ./id.ts
+        pkgx deno^1 cache ./id.ts
         echo "::endgroup::"
       shell: bash
 
diff --git a/id/id.ts b/id/id.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx +git +gh deno run --allow-env --allow-net --allow-write --allow-run=gh,pkgx --allow-read
+#!/usr/bin/env -S pkgx +git +gh deno^1 run --allow-env --allow-net --allow-write --allow-run=gh,pkgx --allow-read
 
 import resolve_pkg from "brewkit/resolve-pkg.ts"
 
diff --git a/lib/actions/platform-key.ts b/lib/actions/platform-key.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx deno run --allow-env --allow-read
+#!/usr/bin/env -S pkgx deno^1 run --allow-env --allow-read
 
 import { Command } from "cliffy/command/mod.ts"
 import get_config from '../resolve-pkg.ts'
diff --git a/lib/actions/stage.ts b/lib/actions/stage.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx deno run --allow-read --allow-env --allow-write
+#!/usr/bin/env -S pkgx deno^1 run --allow-read --allow-env --allow-write
 
 import { hooks, Path } from "pkgx"
 import get_config from '../resolve-pkg.ts'
diff --git a/lib/bin/fix-elf.ts b/lib/bin/fix-elf.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx +nixos.org/patchelf=0.17.2 +darwinsys.com/file^5 deno run -A
+#!/usr/bin/env -S pkgx +nixos.org/patchelf=0.17.2 +darwinsys.com/file^5 deno^1 run -A
 
 // FIXME ^^ patchelf 0.18.0 has a regression that breaks libraries
 //       https://github.com/NixOS/patchelf/issues/492#issuecomment-1561912775
diff --git a/lib/bin/fix-machos.rb b/lib/bin/fix-machos.rb
@@ -51,7 +51,7 @@ def fix
     when :bundle
       fix_rpaths
       fix_install_names
-    when :object
+    when :object, :dsym
       # noop
     else
       throw Error("unknown filetype: #{@file.filetype}: #{@file.filename}")
diff --git a/libexec/fix-shebangs.ts b/libexec/fix-shebangs.ts
@@ -1,60 +1,60 @@
-#!/usr/bin/env -S pkgx deno run -A
+#!/usr/bin/env -S pkgx deno^1 run -A
 
-import { Path } from "pkgx"
-import undent from "outdent"
+import { Path } from "pkgx";
+import undent from "outdent";
 
 const has_shebang = (() => {
-  const encoder = new TextDecoder()
+  const encoder = new TextDecoder();
   return (buf: Uint8Array) => {
-    return encoder.decode(buf) == '#!'
-  }
-})()
+    return encoder.decode(buf) == "#!";
+  };
+})();
 
 for (const path of Deno.args) {
-  if (!Path.cwd().join(path).isFile()) continue
+  if (!Path.cwd().join(path).isFile()) continue;
 
-  console.debug({ path })
+  console.debug({ path });
 
-  const rid = await Deno.open(path, { read: true })
+  const rid = await Deno.open(path, { read: true });
   try {
-    const buf = new Uint8Array(2)
-    await rid.read(buf)
-    if (!has_shebang(buf)) continue
+    const buf = new Uint8Array(2);
+    await rid.read(buf);
+    if (!has_shebang(buf)) continue;
   } finally {
-    rid.close()
+    rid.close();
   }
 
   //FIXME this could be pretty damn efficient if we can find the time
   //NOTE as it stands this is HIDEOUSLY inefficient
 
-  const contents = await Deno.readFile(path)
-  const txt = new TextDecoder().decode(contents)
-  const [line0, ...lines] = txt.split("\n") //lol
+  const contents = await Deno.readFile(path);
+  const txt = new TextDecoder().decode(contents);
+  const [line0, ...lines] = txt.split("\n"); //lol
 
-  const match = line0.match(/^#!\s*(\/[^\s]+)/)
-  if (!match) throw new Error()
-  const interpreter = match[1]
+  const match = line0.match(/^#!\s*(\/[^\s]+)/);
+  if (!match) throw new Error();
+  const interpreter = match[1];
 
   switch (interpreter) {
-  case "/usr/bin/env":
-  case "/bin/sh":
-    console.log({ line0, path })
-    console.log("^^ skipped acceptable shebang")
-    continue
+    case "/usr/bin/env":
+    case "/bin/sh":
+      console.log({ line0, path });
+      console.log("^^ skipped acceptable shebang");
+      continue;
   }
 
-  const shebang = `#!/usr/bin/env ${new Path(interpreter).basename()}`
+  const shebang = `#!/usr/bin/env ${new Path(interpreter).basename()}`;
 
   const rewrite = undent`
     ${shebang}
     ${lines.join("\n")}
-    `
+    `;
 
-  console.log({rewrote: path, to: `#!/usr/bin/env ${interpreter}`})
+  console.log({ rewrote: path, to: `#!/usr/bin/env ${interpreter}` });
 
-  const stat = Deno.lstatSync(path)
-  const needs_chmod = stat.mode && !(stat.mode & 0o200)
-  if (needs_chmod) Deno.chmodSync(path, 0o666)
-  await Deno.writeFile(path, new TextEncoder().encode(rewrite))
-  if (needs_chmod) Deno.chmodSync(path, stat.mode!)
+  const stat = Deno.lstatSync(path);
+  const needs_chmod = stat.mode && !(stat.mode & 0o200);
+  if (needs_chmod) Deno.chmodSync(path, 0o666);
+  await Deno.writeFile(path, new TextEncoder().encode(rewrite));
+  if (needs_chmod) Deno.chmodSync(path, stat.mode!);
 }
diff --git a/scripts/publish-release.sh b/scripts/publish-release.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx +git +gh +jq +gum +npx +deno bash
+#!/usr/bin/env -S pkgx +git +gh +jq +gum +npx +deno^1 bash
 
 set -eo pipefail
 
diff --git a/test/action.yml b/test/action.yml
@@ -24,7 +24,7 @@ runs:
       run: |
         echo "::group::fetch deno deps"
         cd ${GITHUB_ACTION_PATH}
-        pkgx deno cache ./test.ts
+        pkgx deno^1 cache ./test.ts
         echo "::endgroup::"
 
     - name: test
diff --git a/test/test.ts b/test/test.ts
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S pkgx +bash +gum +gh +rsync deno run --ext=ts --allow-env --allow-read --allow-write --allow-net --allow-run
+#!/usr/bin/env -S pkgx +bash +gum +gh +rsync deno^1 run --ext=ts --allow-env --allow-read --allow-write --allow-net --allow-run
 
 //TODO net required because we go to github for version info, but really we should require
 // a built product that is then recorded for us to use
diff --git a/upload-build-artifact/action.yml b/upload-build-artifact/action.yml
@@ -24,7 +24,7 @@ runs:
       shell: bash
       run: |
         echo "::group::fetch deno deps"
-        pkgx deno cache ${GITHUB_ACTION_PATH}/../lib/actions/*.ts --config=${GITHUB_ACTION_PATH}/../deno.jsonc
+        pkgx deno^1 cache ${GITHUB_ACTION_PATH}/../lib/actions/*.ts --config=${GITHUB_ACTION_PATH}/../deno.jsonc
         echo "::endgroup::"
 
     # we must tar because the upload action loses file permissions 😕

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!//usr/bin/env -S pkgx +git +gh deno run --allow-env --allow-read --allow-run --allow-net --ext=ts`
	`1`	`+#!//usr/bin/env -S pkgx +git +gh deno^1 run --allow-env --allow-read --allow-run --allow-net --ext=ts`
`2`	`2`
`3`	`3`	`import { Command } from "cliffy/command/mod.ts"`
`4`	`4`	`import { swallow } from "brewkit/utils.ts"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env -S pkgx +deno +git bash`
	`1`	`+#!/usr/bin/env -S pkgx +deno^1 +git bash`
`2`	`2`
`3`	`3`	`set -eo pipefail`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env -S pkgx +rsync +git +bash +gum +gh +curl +bzip2 +xz +unzip +lzip +column deno run --ext=ts --allow-env --allow-read --allow-write --allow-run --allow-net`
	`1`	`+#!/usr/bin/env -S pkgx +rsync +git +bash +gum +gh +curl +bzip2 +xz +unzip +lzip +column deno^1 run --ext=ts --allow-env --allow-read --allow-write --allow-run --allow-net`
`2`	`2`
`3`	`3`	`import make_build_script from "brewkit/porcelain/build-script.ts"`
`4`	`4`	`import { gum, rsync } from "brewkit/utils.ts"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env -S pkgx +git +gh deno run --allow-env --allow-net --allow-write --allow-run=gh,pkgx --allow-read`
	`1`	`+#!/usr/bin/env -S pkgx +git +gh deno^1 run --allow-env --allow-net --allow-write --allow-run=gh,pkgx --allow-read`
`2`	`2`
`3`	`3`	`import resolve_pkg from "brewkit/resolve-pkg.ts"`
`4`	`4`