Fix for latest zig (#2495)

* Fix for latest zig

* Revert "Use PATH instead of sudo to install bun for testing (#2460)"

This reverts commit 5fd406ca2ffa0cb9c1cb98140bedf0a3ba9e5022.

---------

Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>

6 files changed, 9 insertions, 29 deletions

diff --git a/.github/workflows/bun-linux-build.yml b/.github/workflows/bun-linux-build.yml
index 45e9381ae..07d770354 100644
--- a/.github/workflows/bun-linux-build.yml
+++ b/.github/workflows/bun-linux-build.yml
@@ -174,12 +174,6 @@ jobs:
         with:
           name: bun-${{matrix.tag}}
           path: ${{runner.temp}}/release
-      - id: shim-path
-        name: set path
-        run: |
-          stage_bin=$(mktemp -d)
-          echo "stage_bin=$stage_bin"
-          echo $stage_bin >> $GITHUB_PATH
       - id: install
         name: Install
         run: |
@@ -187,7 +181,7 @@ jobs:
           unzip bun-${{matrix.tag}}.zip
           cd bun-${{matrix.tag}}
           chmod +x bun
-          mv bun $stage_bin/bun
+          sudo mv bun /usr/local/bin/bun
           bun --version
       - id: test
         name: Test (node runner)
diff --git a/.github/workflows/bun-mac-aarch64.yml b/.github/workflows/bun-mac-aarch64.yml
index db2696ddf..642f20d0c 100644
--- a/.github/workflows/bun-mac-aarch64.yml
+++ b/.github/workflows/bun-mac-aarch64.yml
@@ -411,12 +411,6 @@ jobs:
         with:
           name: ${{matrix.tag}}
           path: ${{runner.temp}}/release
-      - id: shim-path
-        name: set path
-        run: |
-          stage_bin=$(mktemp -d)
-          echo "stage_bin=$stage_bin"
-          echo $stage_bin >> $GITHUB_PATH
       - id: install
         name: Install
         run: |
@@ -424,7 +418,7 @@ jobs:
           unzip ${{matrix.tag}}.zip
           cd ${{matrix.tag}}
           chmod +x bun
-          mv bun $stage_bin/bun
+          sudo mv bun /usr/local/bin/bun
           bun --version
       - id: test
         name: Test (node runner)
diff --git a/.github/workflows/bun-mac-x64-baseline.yml b/.github/workflows/bun-mac-x64-baseline.yml
index 025accb32..919333fa5 100644
--- a/.github/workflows/bun-mac-x64-baseline.yml
+++ b/.github/workflows/bun-mac-x64-baseline.yml
@@ -415,12 +415,6 @@ jobs:
         with:
           name: ${{matrix.tag}}
           path: ${{runner.temp}}/release
-      - id: shim-path
-        name: set path
-        run: |
-          stage_bin=$(mktemp -d)
-          echo "stage_bin=$stage_bin"
-          echo $stage_bin >> $GITHUB_PATH
       - id: install
         name: Install
         run: |
@@ -428,7 +422,7 @@ jobs:
           unzip ${{matrix.tag}}.zip
           cd ${{matrix.tag}}
           chmod +x bun
-          mv bun $stage_bin/bun
+          sudo mv bun /usr/local/bin/bun
           bun --version
       - id: test
         name: Test (node runner)
diff --git a/.github/workflows/bun-mac-x64.yml b/.github/workflows/bun-mac-x64.yml
index e19286114..434c43e4e 100644
--- a/.github/workflows/bun-mac-x64.yml
+++ b/.github/workflows/bun-mac-x64.yml
@@ -417,12 +417,6 @@ jobs:
         with:
           name: ${{matrix.tag}}
           path: ${{runner.temp}}/release
-      - id: shim-path
-        name: set path
-        run: |
-          stage_bin=$(mktemp -d)
-          echo "stage_bin=$stage_bin"
-          echo $stage_bin >> $GITHUB_PATH
       - id: install
         name: Install
         run: |
@@ -430,7 +424,7 @@ jobs:
           unzip ${{matrix.tag}}.zip
           cd ${{matrix.tag}}
           chmod +x bun
-          mv bun $stage_bin/bun
+          sudo mv bun /usr/local/bin/bun
           bun --version
       - id: test
         name: Test (node runner)
diff --git a/src/bun.js/api/bun/subprocess.zig b/src/bun.js/api/bun/subprocess.zig
index d122b5170..58ca8b5e5 100644
--- a/src/bun.js/api/bun/subprocess.zig
+++ b/src/bun.js/api/bun/subprocess.zig
@@ -1181,7 +1181,7 @@ pub const Subprocess = struct {
         var actions = PosixSpawn.Actions.init() catch |err| return globalThis.handleError(err, "in posix_spawn");
         if (comptime Environment.isMac) {
             attr.set(
-                os.darwin.POSIX_SPAWN_CLOEXEC_DEFAULT | os.darwin.POSIX_SPAWN_SETSIGDEF | os.darwin.POSIX_SPAWN_SETSIGMASK,
+                bun.C.POSIX_SPAWN_CLOEXEC_DEFAULT | bun.C.POSIX_SPAWN_SETSIGDEF | bun.C.POSIX_SPAWN_SETSIGMASK,
             ) catch |err| return globalThis.handleError(err, "in posix_spawn");
         } else if (comptime Environment.isLinux) {
             attr.set(
diff --git a/src/darwin_c.zig b/src/darwin_c.zig
index 313ecc368..a8f9f9894 100644
--- a/src/darwin_c.zig
+++ b/src/darwin_c.zig
@@ -784,3 +784,7 @@ pub const sockaddr_dl = extern struct {
     //	u_short sdl_route[16];  /* source routing information */
     //#endif
 };
+
+pub usingnamespace @cImport({
+    @cInclude("sys/spawn.h");
+});