Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add tracing_subscriber needed rust flags for each binding #1143

Merged
merged 9 commits into from
Nov 4, 2024
+18 −8
Merged

add tracing_subscriber needed rust flags for each binding #1143

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ad3fdf3
add tracing_subscriber needed rust flags for each binding
aaronvg Nov 4, 2024
54be423
more things
aaronvg Nov 4, 2024
88976f1
bust the cache
aaronvg Nov 4, 2024
9e8f729
bust more cache
aaronvg Nov 4, 2024
94ceeb7
try bust cache again
aaronvg Nov 4, 2024
30c01d3
add rustflags to ts release
aaronvg Nov 4, 2024
204ffa1
more fix
aaronvg Nov 4, 2024
6d365dd
final fix
aaronvg Nov 4, 2024
c72c2f6
cleanup
aaronvg Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build-python-release.reusable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release language_client_python
on:
workflow_call: {}
push:
branches: [manylinux-x86]
branches: [manylinux-x86, aaron-fix]

concurrency:
# suffix is important to prevent a concurrency deadlock with the calling workflow
Expand Down Expand Up @@ -44,13 +44,13 @@ jobs:

- target: x86_64-apple-darwin
runs_on: macos-latest

- target: aarch64-apple-darwin
runs_on: macos-latest

- target: x86_64-pc-windows-msvc
runs_on: windows-latest

name: ${{ matrix._.target }}
runs-on: ${{ matrix._.runs_on }}
steps:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/build-ruby-release.reusable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Release engine/language_client_ruby

on:
workflow_call: {}
push:
branches: [aaron-fix]

permissions:
contents: read
Expand Down Expand Up @@ -72,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
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/build-typescript-release.reusable.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release language_client_typescript
on:
workflow_call: {}
push:
branches: [sam/alpine-warnings]
branches: [sam/alpine-warnings, aaron-fix]

concurrency:
# suffix is important to prevent a concurrency deadlock with the calling workflow
Expand Down Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The RUSTFLAGS environment variable should be quoted to prevent issues with spaces or special characters in the value.

Suggested change
RUSTFLAGS=-C target-feature=-crt-static --cfg tracing_unstable
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

Expand All @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The RUSTFLAGS assignment should be quoted to ensure it is treated as a single string.

Suggested change
RUSTFLAGS=-C target-feature=-crt-static --cfg tracing_unstable
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 }}
Expand Down Expand Up @@ -101,7 +105,7 @@ jobs:
- name: PNPM Install
run: pnpm install --frozen-lockfile
working-directory: engine/language_client_typescript

# per-matrix-entry dependency setup
- name: Build tools setup
run: ${{ matrix._.before }}
Expand All @@ -110,7 +114,7 @@ jobs:
- name: PNPM Build
run: ${{ matrix._.node_build }}
working-directory: engine/language_client_typescript

- name: Build TS
run: pnpm build:ts_build
working-directory: engine/language_client_typescript
Expand All @@ -120,4 +124,4 @@ jobs:
with:
name: bindings-${{ matrix._.target }}
path: engine/language_client_typescript/*.node
if-no-files-found: error
if-no-files-found: error
9 changes: 9 additions & 0 deletions engine/language_client_python/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# to enable json logging we need this serialization feaure. https://docs.rs/tracing-subscriber/latest/tracing_subscriber/#unstable-features
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo in comment: 'feaures' should be 'features'. This typo is also present in engine/language_client_ruby/.cargo/config.toml and engine/language_client_typescript/.cargo/config.toml.

Suggested change
# to enable json logging we need this serialization feaure. https://docs.rs/tracing-subscriber/latest/tracing_subscriber/#unstable-features
# to enable json logging we need this serialization feature. https://docs.rs/tracing-subscriber/latest/tracing_subscriber/#unstable-features

[build]
rustflags = ["--cfg", "tracing_unstable"]

# https://github.com/rust-lang/cargo/issues/8607
[target.x86_64-unknown-linux-musl]
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tracing_unstable"]
[target.aarch64-unknown-linux-musl]
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tracing_unstable"]
9 changes: 9 additions & 0 deletions engine/language_client_ruby/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# to enable json logging we need this serialization feaure. https://docs.rs/tracing-subscriber/latest/tracing_subscriber/#unstable-features
[build]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rustflags setting in language_client_ruby is identical to those in language_client_python and language_client_typescript. Consider consolidating these configurations to avoid duplication.

  • Cargo config for language_client_python (config.toml)
  • Cargo config for language_client_typescript (config.toml)

rustflags = ["--cfg", "tracing_unstable"]

# https://github.com/rust-lang/cargo/issues/8607
[target.x86_64-unknown-linux-musl]
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tracing_unstable"]
[target.aarch64-unknown-linux-musl]
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tracing_unstable"]
1 change: 1 addition & 0 deletions engine/language_client_ruby/ext/ruby_ffi/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# - GEM_NAME is the name of the gem in ext/baml
create_rust_makefile("ruby_ffi") do |r|
r.extra_cargo_args += ["--package", "ruby_ffi"]
r.extra_rustflags = ["--cfg=tracing_unstable"]
r.env = {
"MACOSX_DEPLOYMENT_TARGET" => "10.13",
}
Expand Down
8 changes: 8 additions & 0 deletions engine/language_client_typescript/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# to enable json logging we need this serialization feaure. https://docs.rs/tracing-subscriber/latest/tracing_subscriber/#unstable-features
[build]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This Cargo configuration file is a duplicate of the existing 'engine/.cargo/config.toml'. Consider reusing the existing configuration instead of adding a new one.

rustflags = ["--cfg", "tracing_unstable"]

[target.x86_64-unknown-linux-musl]
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tracing_unstable"]
[target.aarch64-unknown-linux-musl]
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tracing_unstable"]
Loading