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.

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

Try making pull-request workflows non-concurrent #1970

Merged
merged 4 commits into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 15 additions & 5 deletions .github/workflows/on_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ on:
- opened
- synchronize

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

# These jobs use fairly short names as they are a prefix in the display hierarchy
jobs:
checks:
name: Checks
uses: ./.github/workflows/reusable_checks.yml
secrets: inherit

concurrency:
group: pr-checks-${{ github.event.pull_request.number }}
cancel-in-progress: true

min-test-wheel:
name: 'Minimum Wheel'
Expand All @@ -28,11 +26,17 @@ jobs:
WHEEL_ARTIFACT_NAME: '' # the min-test wheel isn't used for anything
RRD_ARTIFACT_NAME: linux-rrd-fast
secrets: inherit
concurrency:
group: pr-min-test-wheel-${{ github.event.pull_request.number }}
cancel-in-progress: true

build-web:
name: 'Build Web'
uses: ./.github/workflows/reusable_build_web.yml
secrets: inherit
concurrency:
group: pr-build-web-${{ github.event.pull_request.number }}
cancel-in-progress: true

upload-web:
name: 'Upload Web'
Expand All @@ -42,6 +46,9 @@ jobs:
RRD_ARTIFACT_NAME: linux-rrd-fast
UPLOAD_COMMIT_OVERRIDE: ${{ github.event.pull_request.head.sha }}
secrets: inherit
concurrency:
group: pr-upload-web-${{ github.event.pull_request.number }}
cancel-in-progress: true

save-pr-summary:
name: 'Save PR Summary'
Expand All @@ -50,3 +57,6 @@ jobs:
with:
PR_NUMBER: ${{ github.event.pull_request.number }}
secrets: inherit
concurrency:
group: pr-save-pr-${{ github.event.pull_request.number }}
cancel-in-progress: true
49 changes: 45 additions & 4 deletions .github/workflows/on_push_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ on:
branches:
- "main"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
checks:
name: Checks
uses: ./.github/workflows/reusable_checks.yml
secrets: inherit
concurrency:
group: push-checks-${{ github.ref_name }}
cancel-in-progress: true

benches:
name: Benchmarks
Expand All @@ -23,6 +22,9 @@ jobs:
BENCH_NAME: main
COMPARE_TO: main
secrets: inherit
concurrency:
group: push-benches-${{ github.ref_name }}
cancel-in-progress: true

deploy-docs:
needs: [checks, benches]
Expand All @@ -32,11 +34,17 @@ jobs:
PY_DOCS_VERSION_NAME: "HEAD"
UPDATE_LATEST: false
secrets: inherit
concurrency:
group: push-deploy-docs-${{ github.ref_name }}
cancel-in-progress: true

build-web:
name: 'Build Web'
uses: ./.github/workflows/reusable_build_web.yml
secrets: inherit
concurrency:
group: push-build-web-${{ github.ref_name }}
cancel-in-progress: true

upload-web:
name: 'Upload Web'
Expand All @@ -46,6 +54,9 @@ jobs:
RRD_ARTIFACT_NAME: linux-rrd
MARK_PRERELEASE_FOR_MAINLINE: true
secrets: inherit
concurrency:
group: push-upload-web-${{ github.ref_name }}
cancel-in-progress: true

build-linux:
needs: [checks]
Expand All @@ -56,6 +67,9 @@ jobs:
WHEEL_ARTIFACT_NAME: linux-wheel
RRD_ARTIFACT_NAME: linux-rrd
secrets: inherit
concurrency:
group: push-build-linux-${{ github.ref_name }}
cancel-in-progress: true

build-windows:
needs: [checks]
Expand All @@ -66,6 +80,9 @@ jobs:
WHEEL_ARTIFACT_NAME: windows-wheel
RRD_ARTIFACT_NAME: ''
secrets: inherit
concurrency:
group: push-build-windows-${{ github.ref_name }}
cancel-in-progress: true

build-macos-arm:
needs: [checks]
Expand All @@ -76,6 +93,9 @@ jobs:
WHEEL_ARTIFACT_NAME: macos-arm-wheel
RRD_ARTIFACT_NAME: ''
secrets: inherit
concurrency:
group: push-build-macos-arm-${{ github.ref_name }}
cancel-in-progress: true

build-macos-intel:
needs: [checks]
Expand All @@ -86,6 +106,9 @@ jobs:
WHEEL_ARTIFACT_NAME: 'macos-intel-wheel'
RRD_ARTIFACT_NAME: ''
secrets: inherit
concurrency:
group: push-build-macos-intel-${{ github.ref_name }}
cancel-in-progress: true

upload-wheels-linux:
name: 'Linux: Upload Wheels'
Expand All @@ -95,6 +118,9 @@ jobs:
WHEEL_ARTIFACT_NAME: linux-wheel
RRD_ARTIFACT_NAME: linux-rrd
secrets: inherit
concurrency:
group: push-upload-wheels-linux-${{ github.ref_name }}
cancel-in-progress: true

upload-wheels-windows:
name: 'Windows: Upload Wheels'
Expand All @@ -104,6 +130,9 @@ jobs:
WHEEL_ARTIFACT_NAME: windows-wheel
RRD_ARTIFACT_NAME: linux-rrd
secrets: inherit
concurrency:
group: push-upload-wheels-windows-${{ github.ref_name }}
cancel-in-progress: true

upload-wheels-macos-arm:
name: 'Macos-Arm: Upload Wheels'
Expand All @@ -113,6 +142,9 @@ jobs:
WHEEL_ARTIFACT_NAME: macos-arm-wheel
RRD_ARTIFACT_NAME: linux-rrd
secrets: inherit
concurrency:
group: push-upload-wheels-macos-arm-${{ github.ref_name }}
cancel-in-progress: true

upload-wheels-macos-intel:
name: 'Macos-Intel: Upload Wheels'
Expand All @@ -122,15 +154,24 @@ jobs:
WHEEL_ARTIFACT_NAME: macos-intel-wheel
RRD_ARTIFACT_NAME: linux-rrd
secrets: inherit
concurrency:
group: push-upload-wheels-macos-intel-${{ github.ref_name }}
cancel-in-progress: true

generate-pip-index:
name: 'Generate Pip Index'
needs: [upload-wheels-linux, upload-wheels-windows, upload-wheels-macos-arm, upload-wheels-macos-intel]
uses: ./.github/workflows/reusable_pip_index.yml
secrets: inherit
concurrency:
group: push-generate-pip-index-${{ github.ref_name }}
cancel-in-progress: true

pre-release:
name: Pre Release
concurrency:
group: push-prerelease-${{ github.ref_name }}
cancel-in-progress: true
needs: [upload-web, generate-pip-index]
runs-on: "ubuntu-latest"
steps:
Expand Down