Skip to content

Commit ec3615b

Browse files
shwinashwina
committed
Revert "Reduce CI matrix"
This reverts commit 13cb606.
1 parent 9af979d commit ec3615b

File tree

2 files changed

+54
-54
lines changed

2 files changed

+54
-54
lines changed

‎.github/workflows/build-and-test-python-wheels.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
python: ['3.13']
21+
python: ['3.10', '3.11', '3.12', '3.13']
2222

2323
steps:
2424
- name: Checkout repository
@@ -54,8 +54,8 @@ jobs:
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
cuda: ['13']
58-
python: ['3.13']
57+
cuda: ['12', '13']
58+
python: ['3.10', '3.11', '3.12', '3.13']
5959

6060
steps:
6161
- name: Checkout repository

‎.github/workflows/pr.yml‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -35,46 +35,46 @@ permissions:
3535
pull-requests: read
3636

3737
jobs:
38-
# compute-matrix:
39-
# name: Compute matrix
40-
# runs-on: ubuntu-latest
41-
# outputs:
42-
# DEVCONTAINER_VERSION: ${{steps.set-outputs.outputs.DEVCONTAINER_VERSION}}
43-
# PER_CUDA_COMPILER_MATRIX: ${{steps.set-outputs.outputs.PER_CUDA_COMPILER_MATRIX}}
44-
# PER_CUDA_COMPILER_KEYS: ${{steps.set-outputs.outputs.PER_CUDA_COMPILER_KEYS}}
45-
# base_sha: ${{ steps.export-pr-info.outputs.base_sha }}
46-
# pr_number: ${{ steps.export-pr-info.outputs.pr_number }}
47-
# steps:
48-
# - name: Checkout repo
49-
# uses: actions/checkout@v4
50-
# - name: Lookup PR info
51-
# id: get-pr-info
52-
# uses: nv-gha-runners/get-pr-info@main
53-
# - name: Export PR info
54-
# id: export-pr-info
55-
# run: |
56-
# echo "base_sha=${{ fromJSON(steps.get-pr-info.outputs.pr-info).base.sha }}" | tee -a "${GITHUB_OUTPUT}"
57-
# echo "pr_number=${{ fromJSON(steps.get-pr-info.outputs.pr-info).number }}" | tee -a "${GITHUB_OUTPUT}"
58-
# - name: Compute matrix outputs
59-
# id: set-outputs
60-
# run: |
61-
# .github/actions/compute-matrix/compute-matrix.sh ci/matrix.yaml pull_request
38+
compute-matrix:
39+
name: Compute matrix
40+
runs-on: ubuntu-latest
41+
outputs:
42+
DEVCONTAINER_VERSION: ${{steps.set-outputs.outputs.DEVCONTAINER_VERSION}}
43+
PER_CUDA_COMPILER_MATRIX: ${{steps.set-outputs.outputs.PER_CUDA_COMPILER_MATRIX}}
44+
PER_CUDA_COMPILER_KEYS: ${{steps.set-outputs.outputs.PER_CUDA_COMPILER_KEYS}}
45+
base_sha: ${{ steps.export-pr-info.outputs.base_sha }}
46+
pr_number: ${{ steps.export-pr-info.outputs.pr_number }}
47+
steps:
48+
- name: Checkout repo
49+
uses: actions/checkout@v4
50+
- name: Lookup PR info
51+
id: get-pr-info
52+
uses: nv-gha-runners/get-pr-info@main
53+
- name: Export PR info
54+
id: export-pr-info
55+
run: |
56+
echo "base_sha=${{ fromJSON(steps.get-pr-info.outputs.pr-info).base.sha }}" | tee -a "${GITHUB_OUTPUT}"
57+
echo "pr_number=${{ fromJSON(steps.get-pr-info.outputs.pr-info).number }}" | tee -a "${GITHUB_OUTPUT}"
58+
- name: Compute matrix outputs
59+
id: set-outputs
60+
run: |
61+
.github/actions/compute-matrix/compute-matrix.sh ci/matrix.yaml pull_request
6262
63-
# nvbench:
64-
# name: NVBench CUDA${{ matrix.cuda_host_combination }}
65-
# permissions:
66-
# id-token: write
67-
# contents: read
68-
# needs: compute-matrix
69-
# uses: ./.github/workflows/dispatch-build-and-test.yml
70-
# strategy:
71-
# fail-fast: false
72-
# matrix:
73-
# cuda_host_combination: ${{ fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_KEYS) }}
74-
# with:
75-
# project_name: "nvbench"
76-
# per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ matrix.cuda_host_combination ]) }}
77-
# devcontainer_version: ${{ needs.compute-matrix.outputs.DEVCONTAINER_VERSION }}
63+
nvbench:
64+
name: NVBench CUDA${{ matrix.cuda_host_combination }}
65+
permissions:
66+
id-token: write
67+
contents: read
68+
needs: compute-matrix
69+
uses: ./.github/workflows/dispatch-build-and-test.yml
70+
strategy:
71+
fail-fast: false
72+
matrix:
73+
cuda_host_combination: ${{ fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_KEYS) }}
74+
with:
75+
project_name: "nvbench"
76+
per_cuda_compiler_matrix: ${{ toJSON(fromJSON(needs.compute-matrix.outputs.PER_CUDA_COMPILER_MATRIX)[ matrix.cuda_host_combination ]) }}
77+
devcontainer_version: ${{ needs.compute-matrix.outputs.DEVCONTAINER_VERSION }}
7878

7979
python-wheels:
8080
name: Python Wheels
@@ -83,16 +83,16 @@ jobs:
8383
contents: read
8484
uses: ./.github/workflows/build-and-test-python-wheels.yml
8585

86-
# verify-devcontainers:
87-
# name: Verify Dev Containers
88-
# if: ${{ !contains(github.event.head_commit.message, '[skip-vdc]') }}
89-
# needs: compute-matrix
90-
# permissions:
91-
# id-token: write
92-
# contents: read
93-
# uses: ./.github/workflows/verify-devcontainers.yml
94-
# with:
95-
# base_sha: ${{ needs.compute-matrix.outputs.base_sha }}
86+
verify-devcontainers:
87+
name: Verify Dev Containers
88+
if: ${{ !contains(github.event.head_commit.message, '[skip-vdc]') }}
89+
needs: compute-matrix
90+
permissions:
91+
id-token: write
92+
contents: read
93+
uses: ./.github/workflows/verify-devcontainers.yml
94+
with:
95+
base_sha: ${{ needs.compute-matrix.outputs.base_sha }}
9696

9797
# This job is the final job that runs after all other jobs and is used for branch protection status checks.
9898
# See: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks
@@ -102,9 +102,9 @@ jobs:
102102
name: CI
103103
if: ${{ always() }} # need to use always() instead of !cancelled() because skipped jobs count as success
104104
needs:
105-
# - nvbench
105+
- nvbench
106106
- python-wheels
107-
# - verify-devcontainers
107+
- verify-devcontainers
108108
steps:
109109
- name: Check status of all precursor jobs
110110
if: >-

0 commit comments

Comments
 (0)