Skip to content

Commit

Permalink
Trying to get rid of skipped jobs again
Browse files Browse the repository at this point in the history
  • Loading branch information
alliepiper committed Apr 22, 2024
1 parent 116e707 commit bf7b53e
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 66 deletions.
96 changes: 48 additions & 48 deletions .github/workflows/ci-dispatch-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}}"
36 changes: 18 additions & 18 deletions ci/compute-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down

0 comments on commit bf7b53e

Please sign in to comment.