From 03dbd241600802f9c9205a662cb5167e7e31eae3 Mon Sep 17 00:00:00 2001 From: divyegala Date: Wed, 18 Oct 2023 16:55:58 -0700 Subject: [PATCH] try to clean commit tree --- .github/workflows/build.yaml | 6 +++--- .github/workflows/pr.yaml | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5a883b64ed..d7fa662317 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -69,11 +69,11 @@ jobs: sha: ${{ inputs.sha }} wheel-build-pylibraft: secrets: inherit +<<<<<<< HEAD uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-23.12 +======= + uses: rapidsai/shared-action-workflows/.github/workflows/wheels-build.yaml@branch-23.12 with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} date: ${{ inputs.date }} script: ci/build_wheel_pylibraft.sh wheel-publish-pylibraft: diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c8bd28d4bb..6f869e2a8b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -54,9 +54,6 @@ jobs: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12 with: - build_type: pull-request - docs-build: - needs: conda-python-build secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-23.12 with: