From 9dd257f1aec92ae5a425ec62158f52940446b18f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Fri, 7 Feb 2025 11:43:10 -0600 Subject: [PATCH] fix merge conflicts --- .github/workflows/pr.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index d1ee99f0..e8c9efc9 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -22,12 +22,6 @@ jobs: - telemetry-setup secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.04 - checks: - secrets: inherit - needs: telemetry-setup - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.04 - with: - ignored_pr_jobs: telemetry-summarize telemetry-setup: runs-on: ubuntu-latest continue-on-error: true @@ -39,6 +33,12 @@ jobs: # since other jobs depend on it. if: ${{ vars.TELEMETRY_ENABLED == 'true' }} uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main + checks: + secrets: inherit + needs: telemetry-setup + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.04 + with: + ignored_pr_jobs: telemetry-summarize conda-cpp-build: needs: checks secrets: inherit