Skip to content

Commit fbda38a

Browse files
authored
Merge branch 'master' into loopback-queue
2 parents 33610e6 + 2eefbc3 commit fbda38a

100 files changed

Lines changed: 5187 additions & 949 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.asf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ github:
4646
io_uring_tpc:
4747
required_pull_request_reviews:
4848
dismiss_stale_reviews: true
49-
required_approving_review_count: 1
49+
required_approving_review_count: 1
5050
required_conversation_resolution: true
5151
custom_subjects:
5252
new_discussion: "{title}"

.github/actions/rust/pre-merge/action.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,13 @@ runs:
173173

174174
- name: Build aarch64-musl
175175
if: inputs.task == 'build-aarch64-musl'
176-
run: cargo build --locked --target aarch64-unknown-linux-musl
176+
# Exclude dashboard crates: charming's "ssr" feature pulls deno_core -> v8,
177+
# which has no prebuilt binary for aarch64-unknown-linux-musl.
178+
# TODO: support when upstream rusty_v8 publishes aarch64-musl binaries.
179+
run: >-
180+
cargo build --locked --workspace --target aarch64-unknown-linux-musl
181+
--exclude iggy-bench-dashboard-server
182+
--exclude bench-dashboard-frontend
177183
shell: bash
178184
env:
179185
# Disable GCC outline atomics to avoid undefined __aarch64_ldadd4_sync

.github/workflows/_build_rust_artifacts.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,15 @@ jobs:
144144
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc
145145
fi
146146
147-
cargo build --locked --release --target ${{ matrix.target }} "${bin_flags[@]}"
147+
# iggy-bench-dashboard-server enables charming's "ssr" feature (deno_core -> v8).
148+
# rusty_v8 has no prebuilt static libraries for any musl target, so exclude
149+
# dashboard crates to prevent cargo feature unification from pulling V8.
150+
exclude_flags=()
151+
if [[ "${{ matrix.libc }}" == "musl" ]]; then
152+
exclude_flags+=(--workspace --exclude iggy-bench-dashboard-server --exclude bench-dashboard-frontend)
153+
fi
154+
155+
cargo build --locked --release --target ${{ matrix.target }} "${bin_flags[@]}" "${exclude_flags[@]}"
148156
149157
- name: Package binaries
150158
id: pkg

0 commit comments

Comments
 (0)