Skip to content

Commit b3bf244

Browse files
committed
revert
1 parent 1bd00c2 commit b3bf244

3 files changed

Lines changed: 3 additions & 55 deletions

File tree

.github/workflows/breaking_changes_detector.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: "Detect breaking changes"
22

33
on:
44
pull_request:
5-
# branches:
6-
# - main
5+
branches:
6+
- main
77

88
permissions:
99
contents: read

ci/scripts/rust_clippy.sh

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -25,57 +25,6 @@ CLIPPY_FEATURES="avro,integration-tests,extended_tests"
2525
CLIPPY_ARGS=(--all-targets --workspace --features "$CLIPPY_FEATURES")
2626
CLIPPY_LINT_ARGS=(-- -D warnings)
2727

28-
CURRENT=$(pwd)
29-
30-
cd "$SCRIPT_DIR/../.." || exit 1
31-
32-
set +e
33-
34-
# Fetch one more commit so HEAD~1 is available (CI uses fetch-depth: 1)
35-
git fetch --deepen=1 2>/dev/null || true
36-
BASELINE_REV=$(git rev-parse HEAD~1)
37-
echo "Baseline revision: $BASELINE_REV"
38-
39-
# Get workspace members from root Cargo.toml, excluding non-public crates
40-
MEMBERS=$(sed -n '/^members = \[/,/\]/p' Cargo.toml | grep '"' | sed 's/.*"\(.*\)".*/\1/' \
41-
| grep -v -e '^benchmarks$' -e '^test-utils$' -e '^datafusion/sqllogictest$' -e '^datafusion/doc$')
42-
43-
# Get changed files compared to baseline
44-
CHANGED_FILES=$(git diff --name-only "$BASELINE_REV"..HEAD)
45-
46-
# Check which workspace members have changes
47-
PACKAGES=""
48-
for member in $MEMBERS; do
49-
if echo "$CHANGED_FILES" | grep -q "^${member}/"; then
50-
pkg=$(grep '^name\s*=' "$member/Cargo.toml" | head -1 | sed 's/.*=\s*"\(.*\)"/\1/')
51-
if [ -n "$pkg" ]; then
52-
PACKAGES="$PACKAGES $pkg"
53-
fi
54-
fi
55-
done
56-
PACKAGES=$(echo "$PACKAGES" | xargs)
57-
echo "Changed crates: $PACKAGES"
58-
59-
if [ -n "$PACKAGES" ]; then
60-
echo "Installing cargo-semver-checks..."
61-
cargo install cargo-semver-checks
62-
63-
ARGS=""
64-
for pkg in $PACKAGES; do
65-
ARGS="$ARGS --package $pkg"
66-
done
67-
68-
echo "Running cargo-semver-checks against origin/main..."
69-
cargo semver-checks --baseline-rev "$BASELINE_REV" $ARGS
70-
else
71-
echo "No public crates changed, skipping semver checks."
72-
fi
73-
74-
75-
echo "Running cargo clippy..."
76-
77-
cd ${CURRENT} || exit 1
78-
7928
source "${SCRIPT_DIR}/utils/git.sh"
8029

8130
MODE="check"
@@ -125,4 +74,3 @@ CLIPPY_CMD+=("${CLIPPY_ARGS[@]}" "${CLIPPY_LINT_ARGS[@]}")
12574

12675
echo "[${SCRIPT_NAME}] \`${CLIPPY_CMD[*]}\`"
12776
"${CLIPPY_CMD[@]}"
128-

datafusion/common-runtime/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ pub use common::SpawnedTask;
3333
pub use join_set::JoinSet;
3434
pub use trace_utils::{
3535
JoinSetTracer, JoinSetTracerError, set_join_set_tracer, trace_block, trace_future,
36-
};
36+
};

0 commit comments

Comments
 (0)