From 30c01d30692ada42e3d56e341ed67c9bd370e8e4 Mon Sep 17 00:00:00 2001
From: Aaron Villalpando <aaron@boundaryml.com>
Date: Mon, 4 Nov 2024 13:39:26 -0800
Subject: [PATCH] add rustflags to ts release

---
 .github/workflows/build-ruby-release.reusable.yaml   |  3 +++
 .../workflows/build-typescript-release.reusable.yaml | 12 ++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-ruby-release.reusable.yaml b/.github/workflows/build-ruby-release.reusable.yaml
index 17003cff0..4c361b565 100644
--- a/.github/workflows/build-ruby-release.reusable.yaml
+++ b/.github/workflows/build-ruby-release.reusable.yaml
@@ -74,6 +74,9 @@ jobs:
           mkdir -p "$rb_sys_dock_cache_dir"
           echo "RB_SYS_DOCK_CACHE_DIR=$rb_sys_dock_cache_dir" >> $GITHUB_ENV
           echo "rb_sys_version=$rb_sys_version" >> $GITHUB_OUTPUT
+          cat >>$GITHUB_ENV <<EOF
+          RUSTFLAGS="--cfg tracing_unstable"
+          EOF
 
       - name: Setup rb-sys
         shell: bash
diff --git a/.github/workflows/build-typescript-release.reusable.yaml b/.github/workflows/build-typescript-release.reusable.yaml
index e87deb69a..599798fcd 100644
--- a/.github/workflows/build-typescript-release.reusable.yaml
+++ b/.github/workflows/build-typescript-release.reusable.yaml
@@ -57,6 +57,7 @@ jobs:
               CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc
               CXX_x86_64_unknown_linux_musl=x86_64-linux-musl-g++
               AR_x86_64_unknown_linux_musl=x86_64-linux-musl-ar
+              RUSTFLAGS="-C target-feature=-crt-static --cfg tracing_unstable"
               EOF
             node_build: pnpm build:napi-release --target x86_64-unknown-linux-musl --use-napi-cross
 
@@ -66,6 +67,9 @@ jobs:
               curl -LO https://musl.cc/aarch64-linux-musl-cross.tgz
               tar -xzf aarch64-linux-musl-cross.tgz
               echo "$PWD/aarch64-linux-musl-cross/bin" >> $GITHUB_PATH
+              cat >>$GITHUB_ENV <<EOF
+              RUSTFLAGS="-C target-feature=-crt-static --cfg tracing_unstable"
+              EOF
             node_build: pnpm build:napi-release --target aarch64-unknown-linux-musl --use-napi-cross
 
     name: ${{ matrix._.target }}
@@ -83,9 +87,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-          # cache: ""
-          # cache-dependency-path: |
-          #   engine/language_client_typescript/pnpm-lock.yaml
+          cache: pnpm
+          cache-dependency-path: |
+            engine/language_client_typescript/pnpm-lock.yaml
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
@@ -95,7 +99,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: engine
-          shared-key: engine-${{ github.job }}-${{ matrix._.target }}-v2
+          shared-key: engine-${{ github.job }}-${{ matrix._.target }}
           cache-on-failure: true
 
       - name: PNPM Install