Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[ci] Update runners to use -testing suffix for now (#2543)" #2548

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Revert "[ci] Update runners to use -testing suffix for now (#2543)" #2548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
973f247
Revert "[ci] Update runners to use -testing suffix for now (#2543)"
bmhowe23 Jan 27, 2025
bde82d8
Merge branch 'main' into pr-revert-testing-changes
bmhowe23 Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev_environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ jobs:
run: |
if [ -n "$(echo ${{ inputs.platforms }} | grep ',')" ]; then
# multi-platform builds get no platform tag
echo "runner=linux-amd64-cpu8-testing" >> $GITHUB_OUTPUT
echo "runner=linux-amd64-cpu8" >> $GITHUB_OUTPUT
elif [ -n "$(echo ${{ inputs.platforms }} | grep -i arm)" ]; then
platform_tag=`echo ${{ inputs.platforms }} | sed 's/linux\///g' | tr -d ' '`
echo "platform_tag=$platform_tag" >> $GITHUB_OUTPUT
echo "runner=linux-arm64-cpu8" >> $GITHUB_OUTPUT
else
platform_tag=`echo ${{ inputs.platforms }} | sed 's/linux\///g' | tr -d ' '`
echo "platform_tag=$platform_tag" >> $GITHUB_OUTPUT
echo "runner=linux-amd64-cpu8-testing" >> $GITHUB_OUTPUT
echo "runner=linux-amd64-cpu8" >> $GITHUB_OUTPUT
fi

repo_owner=${{ github.repository_owner }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker_images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
run: |
if [ -n "$(echo ${{ inputs.platforms }} | grep ',')" ]; then
# multi-platform builds get no platform tag
echo "runner=linux-amd64-cpu16-testing" >> $GITHUB_OUTPUT
echo "runner=linux-amd64-cpu16" >> $GITHUB_OUTPUT
echo "build_docs=${{ inputs.build_docs != 'false' }}" >> $GITHUB_OUTPUT
is_versioned=${{ github.ref_type == 'tag' || startsWith(github.ref_name, 'releases/') || startsWith(github.ref_name, 'staging/') }}
has_continuous_deployment=${{ startsWith(github.ref_name, 'experimental/') || github.ref_name == 'main' }}
Expand All @@ -76,7 +76,7 @@ jobs:
else
platform_tag=`echo ${{ inputs.platforms }} | sed 's/linux\///g' | tr -d ' '`
echo "platform_tag=$platform_tag" >> $GITHUB_OUTPUT
echo "runner=linux-amd64-cpu16-testing" >> $GITHUB_OUTPUT
echo "runner=linux-amd64-cpu16" >> $GITHUB_OUTPUT
echo "build_docs=${{ inputs.build_docs != 'false' }}" >> $GITHUB_OUTPUT
fi

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate_cc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ name: Show Code Coverage Diff

jobs:
gen_code_coverage:
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8-testing' }}
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8' }}
permissions:
contents: read
packages: read
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prebuilt_binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ name: Pre-built binaries
jobs:
build_installer:
name: Build CUDA Quantum assets
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8-testing' }}
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8' }}
permissions:
contents: read
packages: write
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:

build_openmpi:
name: Minimal OpenMPI installation
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8-testing' }}
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8' }}
permissions:
contents: read
packages: write
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:
name: Validate installer
needs: [build_installer, build_openmpi, create_test_config]
if: toJson(fromJSON(needs.create_test_config.outputs.json).operating_systems) != '[]'
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8-testing' }}
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8' }}
permissions:
contents: read
packages: read
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publishing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
platforms=`cat "$name.txt" | egrep -o 'platforms?: \S*' | cut -d ' ' -f 2`
cuda_version=`cat "$name.txt" | egrep -o 'cuda-version: \S*' | cut -d ' ' -f 2`
image_hash=`cat "$name.txt" | grep -o -e "cuda-quantum-dev-image: \S*" -e "cuda-quantum-assets-image: \S*" -e "cuda-quantum-wheeldeps-image: \S*" | cut -d ' ' -f 2`
if [ -n "$(echo $platforms | grep ',')" ]; then runner=linux-amd64-cpu8-testing
if [ -n "$(echo $platforms | grep ',')" ]; then runner=linux-amd64-cpu8
else runner=$(echo $platforms | tr / -)-cpu8
fi

Expand Down Expand Up @@ -328,7 +328,7 @@ jobs:
name: CUDA-Q Docker image
if: ${{ toJson(fromJson(needs.assets.outputs.docker_images).info_files) != '[]' }}
needs: assets
runs-on: linux-amd64-cpu8-testing
runs-on: linux-amd64-cpu8
permissions:
contents: read
packages: write
Expand Down Expand Up @@ -530,7 +530,7 @@ jobs:
info_file: ${{ fromJson(needs.assets.outputs.installers).info_files }}
fail-fast: false

runs-on: ${{ (contains(matrix.info_file, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8-testing' }}
runs-on: ${{ (contains(matrix.info_file, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8' }}

steps:
- name: Checkout repository
Expand Down Expand Up @@ -637,7 +637,7 @@ jobs:
python_version: ['3.10', '3.11', '3.12']
fail-fast: false

runs-on: ${{ (contains(matrix.info_file, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8-testing' }}
runs-on: ${{ (contains(matrix.info_file, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8' }}

steps:
- name: Checkout repository
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ name: Python wheels
jobs:
build_wheel:
name: Build Python ${{ inputs.python_version }} wheel
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8-testing' }}
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8' }}
permissions:
contents: read
packages: read
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
validation:
name: Validate wheel
needs: [build_wheel, create_test_config]
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8-testing' }}
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8' }}
permissions:
contents: read
packages: read
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_in_devenv.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ name: Run CI within the dev environment container
jobs:
build_and_test:
name: Dev environment (Debug)
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8-testing' }}
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8' }}
permissions:
contents: read
packages: read
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:

build_and_test_python:
name: Dev environment (Python)
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8-testing' }}
runs-on: ${{ (contains(inputs.platform, 'arm') && 'linux-arm64-cpu8') || 'linux-amd64-cpu8' }}
permissions:
contents: read
packages: read
Expand Down
Loading