From bf7b53e51fb37fe1cdb7acafe356fb948b5431e1 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Mon, 22 Apr 2024 02:22:46 +0000 Subject: [PATCH] Trying to get rid of skipped jobs again --- .github/workflows/ci-dispatch-job.yml | 96 +++++++++++++-------------- ci/compute-matrix.py | 36 +++++----- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/.github/workflows/ci-dispatch-job.yml b/.github/workflows/ci-dispatch-job.yml index 3e135203f36..46f4932465e 100644 --- a/.github/workflows/ci-dispatch-job.yml +++ b/.github/workflows/ci-dispatch-job.yml @@ -21,14 +21,14 @@ permissions: jobs: linux: name: ${{inputs.name}} - if: startsWith(inputs.dispatch, 'linux') +# if: startsWith(inputs.dispatch, 'linux') permissions: id-token: write contents: read - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(startsWith(inputs.dispatch, 'linux') && inputs.dummy_matrix || '[]') }} +# strategy: +# fail-fast: false +# matrix: +# include: ${{ fromJSON(startsWith(inputs.dispatch, 'linux') && inputs.dummy_matrix || '[]') }} runs-on: ${{inputs.runner}} container: options: -u root @@ -73,46 +73,46 @@ jobs: exit $exit_code fi - windows: - name: ${{inputs.name}} - if: startsWith(inputs.dispatch, 'windows') - permissions: - id-token: write - contents: read - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(startsWith(inputs.dispatch, 'windows') && inputs.dummy_matrix || '[]') }} - runs-on: ${{inputs.runner}} - env: - SCCACHE_BUCKET: rapids-sccache-devs - SCCACHE_REGION: us-east-2 - SCCACHE_IDLE_TIMEOUT: 0 - SCCACHE_S3_USE_SSL: true - SCCACHE_S3_NO_CREDENTIALS: false - steps: - - name: Get AWS credentials for sccache bucket - uses: aws-actions/configure-aws-credentials@v2 - with: - role-to-assume: arn:aws:iam::279114543810:role/gha-oidc-NVIDIA - aws-region: us-east-2 - role-duration-seconds: 43200 # 12 hours - - name: Fetch ${{ inputs.image }} - shell: powershell - run: docker pull ${{ inputs.image }} - - name: Run Command - shell: powershell - run: >- - docker run ${{ inputs.image }} powershell -c "[System.Environment]::SetEnvironmentVariable('AWS_ACCESS_KEY_ID','${{env.AWS_ACCESS_KEY_ID}}') - [System.Environment]::SetEnvironmentVariable('AWS_SECRET_ACCESS_KEY','${{env.AWS_SECRET_ACCESS_KEY}}') - [System.Environment]::SetEnvironmentVariable('AWS_SESSION_TOKEN','${{env.AWS_SESSION_TOKEN }}') - [System.Environment]::SetEnvironmentVariable('SCCACHE_BUCKET','${{env.SCCACHE_BUCKET}}') - [System.Environment]::SetEnvironmentVariable('SCCACHE_REGION','${{env.SCCACHE_REGION}}') - [System.Environment]::SetEnvironmentVariable('SCCACHE_IDLE_TIMEOUT','${{env.SCCACHE_IDLE_TIMEOUT}}') - [System.Environment]::SetEnvironmentVariable('SCCACHE_S3_USE_SSL','${{env.SCCACHE_S3_USE_SSL}}') - [System.Environment]::SetEnvironmentVariable('SCCACHE_S3_NO_CREDENTIALS','${{env.SCCACHE_S3_NO_CREDENTIALS}}') - git clone https://github.com/NVIDIA/cccl.git; - cd cccl; - git fetch --all; - git checkout ${{github.ref_name}}; - ${{inputs.command}}" +# windows: +# name: ${{inputs.name}} +# if: startsWith(inputs.dispatch, 'windows') +# permissions: +# id-token: write +# contents: read +# strategy: +# fail-fast: false +# matrix: +# include: ${{ fromJSON(startsWith(inputs.dispatch, 'windows') && inputs.dummy_matrix || '[]') }} +# runs-on: ${{inputs.runner}} +# env: +# SCCACHE_BUCKET: rapids-sccache-devs +# SCCACHE_REGION: us-east-2 +# SCCACHE_IDLE_TIMEOUT: 0 +# SCCACHE_S3_USE_SSL: true +# SCCACHE_S3_NO_CREDENTIALS: false +# steps: +# - name: Get AWS credentials for sccache bucket +# uses: aws-actions/configure-aws-credentials@v2 +# with: +# role-to-assume: arn:aws:iam::279114543810:role/gha-oidc-NVIDIA +# aws-region: us-east-2 +# role-duration-seconds: 43200 # 12 hours +# - name: Fetch ${{ inputs.image }} +# shell: powershell +# run: docker pull ${{ inputs.image }} +# - name: Run Command +# shell: powershell +# run: >- +# docker run ${{ inputs.image }} powershell -c "[System.Environment]::SetEnvironmentVariable('AWS_ACCESS_KEY_ID','${{env.AWS_ACCESS_KEY_ID}}') +# [System.Environment]::SetEnvironmentVariable('AWS_SECRET_ACCESS_KEY','${{env.AWS_SECRET_ACCESS_KEY}}') +# [System.Environment]::SetEnvironmentVariable('AWS_SESSION_TOKEN','${{env.AWS_SESSION_TOKEN }}') +# [System.Environment]::SetEnvironmentVariable('SCCACHE_BUCKET','${{env.SCCACHE_BUCKET}}') +# [System.Environment]::SetEnvironmentVariable('SCCACHE_REGION','${{env.SCCACHE_REGION}}') +# [System.Environment]::SetEnvironmentVariable('SCCACHE_IDLE_TIMEOUT','${{env.SCCACHE_IDLE_TIMEOUT}}') +# [System.Environment]::SetEnvironmentVariable('SCCACHE_S3_USE_SSL','${{env.SCCACHE_S3_USE_SSL}}') +# [System.Environment]::SetEnvironmentVariable('SCCACHE_S3_NO_CREDENTIALS','${{env.SCCACHE_S3_NO_CREDENTIALS}}') +# git clone https://github.com/NVIDIA/cccl.git; +# cd cccl; +# git fetch --all; +# git checkout ${{github.ref_name}}; +# ${{inputs.command}}" diff --git a/ci/compute-matrix.py b/ci/compute-matrix.py index 0af7da47279..9c0a3de9592 100755 --- a/ci/compute-matrix.py +++ b/ci/compute-matrix.py @@ -332,24 +332,24 @@ def finalize_workflow_dispatch_groups(workflow_dispatch_groups_orig): workflow_dispatch_groups = copy.deepcopy(workflow_dispatch_groups_orig) # Remove all named values that contain an empty list of jobs: - for group_name, group_json in workflow_dispatch_groups.items(): - if not group_json['standalone'] and not group_json['two_stage']: - del workflow_dispatch_groups[group_name] - elif not group_json['standalone']: - del group_json['standalone'] - elif not group_json['two_stage']: - del group_json['two_stage'] - - # Sort the dispatch groups by name: - workflow_dispatch_groups = dict(sorted(workflow_dispatch_groups.items())) - - # Sort the jobs within each dispatch group: - for group_name, group_json in workflow_dispatch_groups.items(): - if 'standalone' in group_json: - group_json['standalone'] = sorted(group_json['standalone'], key=lambda x: x['name']) - if 'two_stage' in group_json: - group_json['two_stage'] = sorted(group_json['two_stage'], key=lambda x: x['producers'][0]['name']) - +# for group_name, group_json in workflow_dispatch_groups.items(): +# if not group_json['standalone'] and not group_json['two_stage']: +# del workflow_dispatch_groups[group_name] +# elif not group_json['standalone']: +# del group_json['standalone'] +# elif not group_json['two_stage']: +# del group_json['two_stage'] +# +# # Sort the dispatch groups by name: +# workflow_dispatch_groups = dict(sorted(workflow_dispatch_groups.items())) +# +# # Sort the jobs within each dispatch group: +# for group_name, group_json in workflow_dispatch_groups.items(): +# if 'standalone' in group_json: +# group_json['standalone'] = sorted(group_json['standalone'], key=lambda x: x['name']) +# if 'two_stage' in group_json: +# group_json['two_stage'] = sorted(group_json['two_stage'], key=lambda x: x['producers'][0]['name']) +# # Count the total number of jobs: total_jobs = 0 for group_name, group_json in workflow_dispatch_groups.items():