try to clean commit tree

divyegala · Oct 18, 2023 · 03dbd24 · 03dbd24
1 parent bc0021b
commit 03dbd24
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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/[email protected]
+=======
+    uses: rapidsai/shared-action-workflows/.github/workflows/[email protected]
     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
@@ -54,9 +54,6 @@ jobs:
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with:
-      build_type: pull-request
-  docs-build:
-    needs: conda-python-build
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with: