Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .github/actions/rust/pre-merge/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ runs:
- name: Setup Rust with cache
uses: ./.github/actions/utils/setup-rust-with-cache
with:
# Only test jobs execute nextest. Avoid downloading it in lint, metadata,
# and cross-build jobs.
install-nextest: ${{ startsWith(inputs.task, 'test-') }}
# These tasks do not compile workspace crates and need no native
# libraries. All compiling tasks keep the existing dependency setup.
install-system-dependencies: ${{ inputs.task != 'fmt' && inputs.task != 'sort' && inputs.task != 'machete' }}
# Miri builds against a nightly toolchain with a separate `target/miri`
# subtree; isolate its cache from the stable `dev` namespace so the
# two don't evict each other.
Expand Down
14 changes: 11 additions & 3 deletions .github/actions/utils/setup-rust-with-cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@ name: setup-rust-with-cache
description: Setup Rust toolchain with Swatinem/rust-cache

inputs:
install-nextest:
description: "Whether to install cargo-nextest"
required: false
default: "false"
install-system-dependencies:
description: "Whether to install system packages required by Rust builds"
required: false
default: "true"
read-cache:
description: "Whether to read from cache"
required: false
Expand Down Expand Up @@ -55,14 +63,14 @@ runs:
aggressive: ${{ inputs.free-disk-space-aggressive }}

- name: Install system dependencies (Linux)
if: runner.os == 'Linux'
if: runner.os == 'Linux' && inputs.install-system-dependencies == 'true'
run: |
sudo apt-get update
sudo apt-get install -y libhwloc-dev pkg-config libudev-dev
shell: bash

- name: Install system dependencies (macOS)
if: runner.os == 'macOS'
if: runner.os == 'macOS' && inputs.install-system-dependencies == 'true'
run: |
# Pin version of hwloc to 2.12.2_1
# brew extract doesn't have this version, so we fetch the formula directly
Expand Down Expand Up @@ -117,7 +125,7 @@ runs:
shell: bash

- name: Install cargo-nextest
if: runner.os == 'Linux'
if: runner.os == 'Linux' && inputs.install-nextest == 'true'
run: |
if command -v cargo-nextest &> /dev/null; then
echo "cargo-nextest already installed"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/coverage-baseline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
- name: Setup Rust with cache
uses: ./.github/actions/utils/setup-rust-with-cache
with:
install-nextest: "true"
# Also warms the GitHub Actions build cache for subsequent PR builds
save-cache: "true"
# llvm-cov instrumentation roughly doubles object sizes; the light
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/python-sdk-version-sync.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/sync-python-interpreter-version.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
Comment thread
hubcio marked this conversation as resolved.
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/sync-rustc-version.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/third-party-licenses.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/uv-lock-check.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
Expand Down
Loading