Skip to content

Commit 95ef315

Browse files
authored
chore: run the circular dependency check on the fork for fork PRs (apache#26574)
## Which issue does this PR close? - Related to apache#25088, apache#25148 ## Rationale for this change apache#25591 moved several CI jobs to run on the submitter's fork. This PR moves an additional job, the circular dependency check. This further reduces the load on the ASF's shared runner pool, and reduces the typical wait time for CI results on PRs. ## What changes are included in this PR? See above. ## What is the testing strategy for this PR? CI change only. `actionlint` passes with no (additional) warnings. ## Are there any user-facing changes? No.
1 parent 61ec845 commit 95ef315

3 files changed

Lines changed: 21 additions & 17 deletions

File tree

‎.github/workflows/dependencies.yml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,6 @@ permissions:
4040
contents: read
4141

4242
jobs:
43-
depcheck:
44-
name: Circular Dependency Check
45-
runs-on: ubuntu-latest
46-
container:
47-
image: amd64/rust
48-
steps:
49-
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
50-
with:
51-
submodules: true
52-
fetch-depth: 1
53-
- name: Setup Rust toolchain
54-
uses: ./.github/actions/setup-builder
55-
with:
56-
rust-version: stable
57-
- name: Check dependencies
58-
run: bash ci/scripts/check_circular_dependencies.sh
59-
6043
detect-unused-dependencies:
6144
name: Detect Unused Dependencies
6245
runs-on: ubuntu-slim

‎.github/workflows/rust.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -979,3 +979,22 @@ jobs:
979979
- name: Check datafusion-proto
980980
working-directory: datafusion/proto
981981
run: cargo msrv --output-format json --log-target stdout verify
982+
983+
# Check for dependency cycles between DataFusion crates with `dev/depcheck`.
984+
depcheck:
985+
name: Circular Dependency Check
986+
if: ${{ !(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'apache/datafusion') && !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork && github.base_ref == 'main') }}
987+
runs-on: ubuntu-latest
988+
container:
989+
image: amd64/rust
990+
steps:
991+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
992+
with:
993+
submodules: true
994+
fetch-depth: 1
995+
- name: Setup Rust toolchain
996+
uses: ./.github/actions/setup-builder
997+
with:
998+
rust-version: stable
999+
- name: Check dependencies
1000+
run: bash ci/scripts/check_circular_dependencies.sh

‎ci/scripts/check_rust_workflow_skips.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"check-fmt",
5353
"check-workflow-tool-installs",
5454
"config-docs-check",
55+
"depcheck",
5556
"examples-docs-check",
5657
"linux-cargo-check-datafusion",
5758
"linux-cargo-check-datafusion-spark",
@@ -82,6 +83,7 @@
8283
"cargo-toml-formatting-checks",
8384
"clippy",
8485
"config-docs-check",
86+
"depcheck",
8587
"examples-docs-check",
8688
"linux-build-lib",
8789
"linux-cargo-check-datafusion",

0 commit comments

Comments
 (0)